git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
sh
/
kernel
/
cpu
/
clock-cpg.c
diff --git
a/arch/sh/kernel/cpu/clock-cpg.c
b/arch/sh/kernel/cpu/clock-cpg.c
index
dd0e0f2
..
8f63a26
100644
(file)
--- a/
arch/sh/kernel/cpu/clock-cpg.c
+++ b/
arch/sh/kernel/cpu/clock-cpg.c
@@
-67,7
+67,7
@@
int __init __deprecated cpg_clk_init(void)
}
/*
}
/*
- * Placeholder for compat
a
bility, until the lazy CPUs do this
+ * Placeholder for compat
i
bility, until the lazy CPUs do this
* on their own.
*/
int __init __weak arch_clk_init(void)
* on their own.
*/
int __init __weak arch_clk_init(void)