Merge branch 'fixes_a_2.6.38rc' of git://git.pwsan.com/linux-2.6 into omap-fixes

1 files changed, 7 insertions, 0 deletions

diff --git a/arch/arm/mach-omap1/time.c b/arch/arm/mach-omap1/time.c
index ed7a61ff916a..6ec65e599997 100644
--- a/arch/arm/mach-omap1/time.c
+++ b/arch/arm/mach-omap1/time.c
@@ -244,6 +244,13 @@ static void __init omap_timer_init(void)
 
         omap_init_mpu_timer(rate);
         omap_init_clocksource(rate);
+        /*
+         * XXX Since this file seems to deal mostly with the MPU timer,
+         * this doesn't seem like the correct place for the sync timer
+         * clocksource init.
+         */
+        if (!cpu_is_omap7xx() && !cpu_is_omap15xx())
+                omap_init_clocksource_32k();
 }
 
 struct sys_timer omap_timer = {