summaryrefslogtreecommitdiffstats
path: root/drivers/serial
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-11-30 17:46:52 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-11-30 17:46:52 +0000
commit112243034cec7c3ef0499fdebf39218714da453d (patch)
treef6469eaab26ea2e985da32b5cc297ddb9c64f952 /drivers/serial
parent773e9610a7bd44720b8b625d01997b2953edc2db (diff)
parentee569c43e340202fb0ba427c57b77568a32b9a3a (diff)
downloadlinux-112243034cec7c3ef0499fdebf39218714da453d.tar.gz
linux-112243034cec7c3ef0499fdebf39218714da453d.tar.bz2
linux-112243034cec7c3ef0499fdebf39218714da453d.zip
Merge branch 'clks' into devel
Diffstat (limited to 'drivers/serial')
-rw-r--r--drivers/serial/amba-pl010.c2
-rw-r--r--drivers/serial/amba-pl011.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/serial/amba-pl010.c b/drivers/serial/amba-pl010.c
index 71562689116f..e3a5ad5ef1d6 100644
--- a/drivers/serial/amba-pl010.c
+++ b/drivers/serial/amba-pl010.c
@@ -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;
diff --git a/drivers/serial/amba-pl011.c b/drivers/serial/amba-pl011.c
index b7180046f8db..8b2b9700f3e4 100644
--- a/drivers/serial/amba-pl011.c
+++ b/drivers/serial/amba-pl011.c
@@ -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;