Merge branch 'for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu

[~andy/linux] / arch / cris / Kconfig

diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig
index 408b055c585f489e9f3a76c66f32da6680be8d91..2995035812eccaf8b80f3d889470626dee7f36e2 100644 (file)
--- a/arch/cris/Kconfig
+++ b/arch/cris/Kconfig
@@ -19,10 +19,6 @@ config GENERIC_CMOS_UPDATE
 config ARCH_USES_GETTIMEOFFSET
        def_bool n
 
-config GENERIC_IOMAP
-       bool
-       default y
-
 config ARCH_HAS_ILOG2_U32
        bool
        default n
@@ -52,6 +48,8 @@ config CRIS
        select HAVE_IDE
        select HAVE_GENERIC_HARDIRQS
        select GENERIC_IRQ_SHOW
+       select GENERIC_IOMAP
+       select GENERIC_SMP_IDLE_THREAD if ETRAX_ARCH_V32
 
 config HZ
        int