Merge branch 'sh/multi-unwinders' into sh-latest

[~andy/linux] / arch / arm / mach-omap1 / time.c

diff --git a/arch/arm/mach-omap1/time.c b/arch/arm/mach-omap1/time.c
index 2fae6a2740f18e0e1b2fa6c910adccd48dae3d7b..4062480bfec7ca6baf5237d177d77d853ba029bd 100644 (file)
--- a/arch/arm/mach-omap1/time.c
+++ b/arch/arm/mach-omap1/time.c
@@ -44,7 +44,6 @@
 #include <linux/clockchips.h>
 #include <linux/io.h>
 
-#include <asm/system.h>
 #include <asm/leds.h>
 #include <asm/irq.h>
 #include <asm/sched_clock.h>
@@ -233,20 +232,6 @@ static inline void omap_mpu_timer_init(void)
 }
 #endif /* CONFIG_OMAP_MPU_TIMER */
 
-static inline int omap_32k_timer_usable(void)
-{
-       int res = false;
-
-       if (cpu_is_omap730() || cpu_is_omap15xx())
-               return res;
-
-#ifdef CONFIG_OMAP_32K_TIMER
-       res = omap_32k_timer_init();
-#endif
-
-       return res;
-}
-
 /*
  * ---------------------------------------------------------------------------
  * Timer initialization
@@ -254,7 +239,7 @@ static inline int omap_32k_timer_usable(void)
  */
 static void __init omap1_timer_init(void)
 {
-       if (!omap_32k_timer_usable())
+       if (omap_32k_timer_init() != 0)
                omap_mpu_timer_init();
 }