Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

[cascardo/linux.git] / arch / cris / Kconfig

diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig
index b3abfb0..22d34d6 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
@@ -49,6 +43,8 @@ config CRIS
        select HAVE_GENERIC_HARDIRQS
        select GENERIC_IRQ_SHOW
        select GENERIC_IOMAP
+       select GENERIC_SMP_IDLE_THREAD if ETRAX_ARCH_V32
+       select GENERIC_CMOS_UPDATE
 
 config HZ
        int