Merge branches 'core-fixes-for-linus', 'irq-fixes-for-linus' and 'timers-fixes-for...

[mv-sheeva.git] / arch / sh / kernel / time_32.c

diff --git a/arch/sh/kernel/time_32.c b/arch/sh/kernel/time_32.c
index 766554ba2a5b0ec70311b36c2e3ca90a2b8691d4..c34e1e0f9b025072e8fb056d727a61e652656193 100644 (file)
--- a/arch/sh/kernel/time_32.c
+++ b/arch/sh/kernel/time_32.c
@@ -104,7 +104,6 @@ int do_settimeofday(struct timespec *tv)
 EXPORT_SYMBOL(do_settimeofday);
 #endif /* !CONFIG_GENERIC_TIME */
 
-#ifndef CONFIG_GENERIC_CLOCKEVENTS
 /* last time the RTC clock got updated */
 static long last_rtc_update;
 
@@ -148,7 +147,6 @@ void handle_timer_tick(void)
        update_process_times(user_mode(get_irq_regs()));
 #endif
 }
-#endif /* !CONFIG_GENERIC_CLOCKEVENTS */
 
 #ifdef CONFIG_PM
 int timer_suspend(struct sys_device *dev, pm_message_t state)