Merge branch 'clks' into devel

This commit is contained in:
Russell King 2008-11-30 17:46:52 +00:00 • committed by Russell King
commit 112243034c
13 changed files with 65 additions and 271 deletions

View file

@ -692,7 +692,7 @@ static int pl010_probe(struct amba_device *dev, void *id)
goto free;
}
uap->clk = clk_get(&dev->dev, "UARTCLK");
uap->clk = clk_get(&dev->dev, NULL);
if (IS_ERR(uap->clk)) {
ret = PTR_ERR(uap->clk);
goto unmap;

View file

@ -756,7 +756,7 @@ static int pl011_probe(struct amba_device *dev, void *id)
goto free;
}
uap->clk = clk_get(&dev->dev, "UARTCLK");
uap->clk = clk_get(&dev->dev, NULL);
if (IS_ERR(uap->clk)) {
ret = PTR_ERR(uap->clk);
goto unmap;