diff options
-rw-r--r-- | arch/sh/Kconfig | 1 | ||||
-rw-r--r-- | arch/sh/kernel/time_32.c | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index c6faad734e57..50c992444e55 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig | |||
@@ -431,7 +431,6 @@ config SH_CMT | |||
431 | config SH_TIMER_CMT | 431 | config SH_TIMER_CMT |
432 | bool "CMT clockevents driver" | 432 | bool "CMT clockevents driver" |
433 | depends on SYS_SUPPORTS_CMT && !SH_CMT | 433 | depends on SYS_SUPPORTS_CMT && !SH_CMT |
434 | select GENERIC_TIME | ||
435 | select GENERIC_CLOCKEVENTS | 434 | select GENERIC_CLOCKEVENTS |
436 | 435 | ||
437 | config SH_MTU2 | 436 | config SH_MTU2 |
diff --git a/arch/sh/kernel/time_32.c b/arch/sh/kernel/time_32.c index 766554ba2a5b..c34e1e0f9b02 100644 --- a/arch/sh/kernel/time_32.c +++ b/arch/sh/kernel/time_32.c | |||
@@ -104,7 +104,6 @@ int do_settimeofday(struct timespec *tv) | |||
104 | EXPORT_SYMBOL(do_settimeofday); | 104 | EXPORT_SYMBOL(do_settimeofday); |
105 | #endif /* !CONFIG_GENERIC_TIME */ | 105 | #endif /* !CONFIG_GENERIC_TIME */ |
106 | 106 | ||
107 | #ifndef CONFIG_GENERIC_CLOCKEVENTS | ||
108 | /* last time the RTC clock got updated */ | 107 | /* last time the RTC clock got updated */ |
109 | static long last_rtc_update; | 108 | static long last_rtc_update; |
110 | 109 | ||
@@ -148,7 +147,6 @@ void handle_timer_tick(void) | |||
148 | update_process_times(user_mode(get_irq_regs())); | 147 | update_process_times(user_mode(get_irq_regs())); |
149 | #endif | 148 | #endif |
150 | } | 149 | } |
151 | #endif /* !CONFIG_GENERIC_CLOCKEVENTS */ | ||
152 | 150 | ||
153 | #ifdef CONFIG_PM | 151 | #ifdef CONFIG_PM |
154 | int timer_suspend(struct sys_device *dev, pm_message_t state) | 152 | int timer_suspend(struct sys_device *dev, pm_message_t state) |