Merge branch 'master' into for-linus

[pandora-kernel.git] / arch / arm / mach-omap2 / clock44xx_data.c

diff --git a/arch/arm/mach-omap2/clock44xx_data.c b/arch/arm/mach-omap2/clock44xx_data.c
index a5c0c9c..0280422 100644 (file)
--- a/arch/arm/mach-omap2/clock44xx_data.c
+++ b/arch/arm/mach-omap2/clock44xx_data.c
@@ -2675,6 +2675,11 @@ static struct omap_clk omap44xx_clks[] = {
        CLK("omap2_mcspi.2",    "ick",                  &dummy_ck,      CK_443X),
        CLK("omap2_mcspi.3",    "ick",                  &dummy_ck,      CK_443X),
        CLK("omap2_mcspi.4",    "ick",                  &dummy_ck,      CK_443X),
+       CLK("mmci-omap-hs.0",   "ick",          &dummy_ck,      CK_443X),
+       CLK("mmci-omap-hs.1",   "ick",          &dummy_ck,      CK_443X),
+       CLK("mmci-omap-hs.2",   "ick",          &dummy_ck,      CK_443X),
+       CLK("mmci-omap-hs.3",   "ick",          &dummy_ck,      CK_443X),
+       CLK("mmci-omap-hs.4",   "ick",          &dummy_ck,      CK_443X),
        CLK(NULL,       "uart1_ick",                    &dummy_ck,      CK_443X),
        CLK(NULL,       "uart2_ick",                    &dummy_ck,      CK_443X),
        CLK(NULL,       "uart3_ick",                    &dummy_ck,      CK_443X),