projects
/
linux-flexiantxendom0-natty.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[linux-flexiantxendom0-natty.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
fc55ab4
..
1820a55
100644
(file)
--- a/
arch/arm/mach-omap2/clock2420_data.c
+++ b/
arch/arm/mach-omap2/clock2420_data.c
@@
-1841,6
+1841,7
@@
static struct omap_clk omap2420_clks[] = {
CLK(NULL, "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),
};
/*