Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2010-05-03 11:28:58 +08:00
parent 97e3d94aac be1066bbcd
commit df2071bd08
7643 changed files with 241568 additions and 106985 deletions
--- 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),
 };

 /*