Merge current mainline tree into linux-omap tree

[pandora-kernel.git] / arch / arm / plat-omap / common.c

diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c
index 7913248..f498a23 100644 (file)
--- a/arch/arm/plat-omap/common.c
+++ b/arch/arm/plat-omap/common.c
@@ -272,7 +272,6 @@ static void __init __omap2_set_globals(void)
        omap2_set_globals_sdrc(omap2_globals);
        omap2_set_globals_control(omap2_globals);
        omap2_set_globals_prcm(omap2_globals);
-       omap2_set_globals_clock24xx(omap2_globals);
 }
 
 #endif