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 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap2
/
clock2420_data.c
diff --git
a/arch/arm/mach-omap2/clock2420_data.c
b/arch/arm/mach-omap2/clock2420_data.c
index
ed1295f
..
0a992bc
100644
(file)
--- a/
arch/arm/mach-omap2/clock2420_data.c
+++ b/
arch/arm/mach-omap2/clock2420_data.c
@@
-1877,7
+1877,7
@@
static struct omap_clk omap2420_clks[] = {
CLK("omap-aes", "ick", &aes_ick, CK_242X),
CLK(NULL, "pka_ick", &pka_ick, CK_242X),
CLK(NULL, "usb_fck", &usb_fck, CK_242X),
CLK("omap-aes", "ick", &aes_ick, CK_242X),
CLK(NULL, "pka_ick", &pka_ick, CK_242X),
CLK(NULL, "usb_fck", &usb_fck, CK_242X),
- CLK("musb
_
hdrc", "fck", &osc_ck, CK_242X),
+ CLK("musb
-
hdrc", "fck", &osc_ck, CK_242X),
};
/*
};
/*