git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'clks' into devel
[safe/jmp/linux-2.6]
/
drivers
/
video
/
amba-clcd.c
diff --git
a/drivers/video/amba-clcd.c
b/drivers/video/amba-clcd.c
index
70ba1bd
..
2ac52fd
100644
(file)
--- 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;