diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-11-30 12:46:52 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-11-30 12:46:52 -0500 |
| commit | 112243034cec7c3ef0499fdebf39218714da453d (patch) | |
| tree | f6469eaab26ea2e985da32b5cc297ddb9c64f952 /drivers/video/amba-clcd.c | |
| parent | 773e9610a7bd44720b8b625d01997b2953edc2db (diff) | |
| parent | ee569c43e340202fb0ba427c57b77568a32b9a3a (diff) | |
Merge branch 'clks' into devel
Diffstat (limited to 'drivers/video/amba-clcd.c')
| -rw-r--r-- | drivers/video/amba-clcd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/amba-clcd.c b/drivers/video/amba-clcd.c index 70ba1bd845fb..2ac52fd8cc11 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) | |||
| 343 | { | 343 | { |
| 344 | int ret; | 344 | int ret; |
| 345 | 345 | ||
| 346 | fb->clk = clk_get(&fb->dev->dev, "CLCDCLK"); | 346 | fb->clk = clk_get(&fb->dev->dev, NULL); |
| 347 | if (IS_ERR(fb->clk)) { | 347 | if (IS_ERR(fb->clk)) { |
| 348 | ret = PTR_ERR(fb->clk); | 348 | ret = PTR_ERR(fb->clk); |
| 349 | goto out; | 349 | goto out; |