projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
[linux-2.6-block.git]
/
arch
/
arm
/
common
/
sa1111.c
diff --git
a/arch/arm/common/sa1111.c
b/arch/arm/common/sa1111.c
index c8e8f0ea59e1b2ce146da5effe3f6ebada19df6d..0a8e1ff2af8a99255b0f419d6b7b82f7fe5721a9 100644
(file)
--- a/
arch/arm/common/sa1111.c
+++ b/
arch/arm/common/sa1111.c
@@
-627,7
+627,7
@@
__sa1111_probe(struct device *me, struct resource *mem, int irq)
if (!sachip)
return -ENOMEM;
- sachip->clk = clk_get(me, "
GPIO27
_CLK");
+ sachip->clk = clk_get(me, "
SA1111
_CLK");
if (!sachip->clk) {
ret = PTR_ERR(sachip->clk);
goto err_free;