Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / arch / sh / Kconfig

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 3e723aaa5e18adfa9588f5b7f642ff973f10dc69..5e05c0b445bb1f89978f866d5c15e20dc9745a83 100644 (file)
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -29,6 +29,8 @@ config SUPERH
        select GENERIC_ATOMIC64
        select GENERIC_IRQ_SHOW
        select GENERIC_SMP_IDLE_THREAD
+       select GENERIC_CLOCKEVENTS
+       select GENERIC_CMOS_UPDATE if SH_SH03 || SH_DREAMCAST
        help
          The SuperH is a RISC processor targeted for use in embedded systems
          and consumer electronics; it was also used in the Sega Dreamcast
@@ -87,16 +89,6 @@ config GENERIC_GPIO
 config GENERIC_CALIBRATE_DELAY
        bool
 
-config GENERIC_CLOCKEVENTS
-       def_bool y
-
-config GENERIC_CLOCKEVENTS_BROADCAST
-       bool
-
-config GENERIC_CMOS_UPDATE
-       def_bool y
-       depends on SH_SH03 || SH_DREAMCAST
-
 config GENERIC_LOCKBREAK
        def_bool y
        depends on SMP && PREEMPT
@@ -611,8 +603,6 @@ config SH_CLK_CPG_LEGACY
                      !CPU_SUBTYPE_SH7734 && !CPU_SUBTYPE_SH7264 && \
                      !CPU_SUBTYPE_SH7269
 
-source "kernel/time/Kconfig"
-
 endmenu
 
 menu "CPU Frequency scaling"