summaryrefslogtreecommitdiffstats
path: root/drivers/video/amba-clcd.c
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/video/amba-clcd.c
parent773e9610a7bd44720b8b625d01997b2953edc2db (diff)
parentee569c43e340202fb0ba427c57b77568a32b9a3a (diff)
downloadop-kernel-dev-112243034cec7c3ef0499fdebf39218714da453d.zip
op-kernel-dev-112243034cec7c3ef0499fdebf39218714da453d.tar.gz
Merge branch 'clks' into devel
Diffstat (limited to 'drivers/video/amba-clcd.c')
-rw-r--r--drivers/video/amba-clcd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/amba-clcd.c b/drivers/video/amba-clcd.c
index 70ba1bd..2ac52fd 100644
--- a/drivers/video/amba-clcd.c
+++ b/drivers/video/amba-clcd.c
@@ -343,7 +343,7 @@ static int clcdfb_register(struct clcd_fb *fb)
{
int ret;
- fb->clk = clk_get(&fb->dev->dev, "CLCDCLK");
+ fb->clk = clk_get(&fb->dev->dev, NULL);
if (IS_ERR(fb->clk)) {
ret = PTR_ERR(fb->clk);
goto out;
OpenPOWER on IntegriCloud