Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~keithp/linux into...

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

diff --git a/arch/arm/mach-omap2/clock3xxx_data.c b/arch/arm/mach-omap2/clock3xxx_data.c
index 65dd363..5d0064a 100644 (file)
--- a/arch/arm/mach-omap2/clock3xxx_data.c
+++ b/arch/arm/mach-omap2/clock3xxx_data.c
@@ -3464,18 +3464,6 @@ static struct omap_clk omap3xxx_clks[] = {
        CLK("musb-am35x",       "fck",          &hsotgusb_fck_am35xx,   CK_AM35XX),
        CLK(NULL,       "hecc_ck",      &hecc_ck,       CK_AM35XX),
        CLK(NULL,       "uart4_ick",    &uart4_ick_am35xx,      CK_AM35XX),
-       CLK("omap_timer.1",     "fck",  &gpt1_fck,      CK_3XXX),
-       CLK("omap_timer.2",     "fck",  &gpt2_fck,      CK_3XXX),
-       CLK("omap_timer.3",     "fck",  &gpt3_fck,      CK_3XXX),
-       CLK("omap_timer.4",     "fck",  &gpt4_fck,      CK_3XXX),
-       CLK("omap_timer.5",     "fck",  &gpt5_fck,      CK_3XXX),
-       CLK("omap_timer.6",     "fck",  &gpt6_fck,      CK_3XXX),
-       CLK("omap_timer.7",     "fck",  &gpt7_fck,      CK_3XXX),
-       CLK("omap_timer.8",     "fck",  &gpt8_fck,      CK_3XXX),
-       CLK("omap_timer.9",     "fck",  &gpt9_fck,      CK_3XXX),
-       CLK("omap_timer.10",    "fck",  &gpt10_fck,     CK_3XXX),
-       CLK("omap_timer.11",    "fck",  &gpt11_fck,     CK_3XXX),
-       CLK("omap_timer.12",    "fck",  &gpt12_fck,     CK_3XXX),
        CLK("omap_timer.1",     "32k_ck",       &omap_32k_fck,  CK_3XXX),
        CLK("omap_timer.2",     "32k_ck",       &omap_32k_fck,  CK_3XXX),
        CLK("omap_timer.3",     "32k_ck",       &omap_32k_fck,  CK_3XXX),