Merge branch 'msm-fix' of git://codeaurora.org/quic/kernel/davidb/linux-msm into...

[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 14a6277..61ad385 100644 (file)
--- a/arch/arm/mach-omap2/clock2420_data.c
+++ b/arch/arm/mach-omap2/clock2420_data.c
@@ -1898,18 +1898,6 @@ static struct omap_clk omap2420_clks[] = {
        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("omap_timer.1",     "fck",  &gpt1_fck,      CK_242X),
-       CLK("omap_timer.2",     "fck",  &gpt2_fck,      CK_242X),
-       CLK("omap_timer.3",     "fck",  &gpt3_fck,      CK_242X),
-       CLK("omap_timer.4",     "fck",  &gpt4_fck,      CK_242X),
-       CLK("omap_timer.5",     "fck",  &gpt5_fck,      CK_242X),
-       CLK("omap_timer.6",     "fck",  &gpt6_fck,      CK_242X),
-       CLK("omap_timer.7",     "fck",  &gpt7_fck,      CK_242X),
-       CLK("omap_timer.8",     "fck",  &gpt8_fck,      CK_242X),
-       CLK("omap_timer.9",     "fck",  &gpt9_fck,      CK_242X),
-       CLK("omap_timer.10",    "fck",  &gpt10_fck,     CK_242X),
-       CLK("omap_timer.11",    "fck",  &gpt11_fck,     CK_242X),
-       CLK("omap_timer.12",    "fck",  &gpt12_fck,     CK_242X),
        CLK("omap_timer.1",     "32k_ck",       &func_32k_ck,   CK_243X),
        CLK("omap_timer.2",     "32k_ck",       &func_32k_ck,   CK_243X),
        CLK("omap_timer.3",     "32k_ck",       &func_32k_ck,   CK_243X),