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 'omap4-i2c-init' into omap-for-linus
[pandora-kernel.git]
/
arch
/
sh
/
kernel
/
cpu
/
hwblk.c
diff --git
a/arch/sh/kernel/cpu/hwblk.c
b/arch/sh/kernel/cpu/hwblk.c
index
67a1e81
..
3e985aa
100644
(file)
--- a/
arch/sh/kernel/cpu/hwblk.c
+++ b/
arch/sh/kernel/cpu/hwblk.c
@@
-146,6
+146,11
@@
int __init sh_hwblk_clk_register(struct clk *clks, int nr)
for (k = 0; !ret && (k < nr); k++) {
clkp = clks + k;
+
+ /* skip over clocks using hwblk 0 (HWBLK_UNKNOWN) */
+ if (!clkp->arch_flags)
+ continue;
+
clkp->ops = &sh_hwblk_clk_ops;
ret |= clk_register(clkp);
}