sh: Don't enable GENERIC_TIME for the CMT clockevent driver yet.

GENERIC_TIME still depends on the clocksource bits being there, which is
presently not supported. This allows the CMT clockevent driver to be used
alongside alternate system timers that do not yet provide a clocksource
of their own (MTU2 and so on in the case of SH-2A).

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index c6faad734e57cba32cde32d8c89b8af2401260b4..50c992444e557afff112a4d53872eb6f6ebe4007 100644 (file)
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -431,7 +431,6 @@ config SH_CMT
 config SH_TIMER_CMT
        bool "CMT clockevents driver"
        depends on SYS_SUPPORTS_CMT && !SH_CMT
-       select GENERIC_TIME
        select GENERIC_CLOCKEVENTS
 
 config SH_MTU2

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)