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

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

diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig
index 2995035812eccaf8b80f3d889470626dee7f36e2..22d34d64cc81d014ef39e793f14dc1b28d105655 100644 (file)
--- a/arch/cris/Kconfig
+++ b/arch/cris/Kconfig
@@ -13,12 +13,6 @@ config RWSEM_GENERIC_SPINLOCK
 config RWSEM_XCHGADD_ALGORITHM
        bool
 
-config GENERIC_CMOS_UPDATE
-       def_bool y
-
-config ARCH_USES_GETTIMEOFFSET
-       def_bool n
-
 config ARCH_HAS_ILOG2_U32
        bool
        default n
@@ -50,6 +44,7 @@ config CRIS
        select GENERIC_IRQ_SHOW
        select GENERIC_IOMAP
        select GENERIC_SMP_IDLE_THREAD if ETRAX_ARCH_V32
+       select GENERIC_CMOS_UPDATE
 
 config HZ
        int