Merge branch 'stable/for-linus-fixes-3.2' of git://git.kernel.org/pub/scm/linux/kerne...

[pandora-kernel.git] / arch / m68k / Kconfig

diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index 290f9c8..361d540 100644 (file)
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -4,8 +4,8 @@ config M68K
        select HAVE_IDE
        select HAVE_AOUT if MMU
        select GENERIC_ATOMIC64 if MMU
-       select HAVE_GENERIC_HARDIRQS if !MMU
-       select GENERIC_IRQ_SHOW if !MMU
+       select HAVE_GENERIC_HARDIRQS
+       select GENERIC_IRQ_SHOW
        select ARCH_HAVE_NMI_SAFE_CMPXCHG if RMW_INSNS
 
 config RWSEM_GENERIC_SPINLOCK
@@ -84,13 +84,6 @@ config MMU_SUN3
        bool
        depends on MMU && !MMU_MOTOROLA
 
-config USE_GENERIC_HARDIRQS
-       bool "Use genirq"
-       depends on MMU
-       depends on !Q40
-       select HAVE_GENERIC_HARDIRQS
-       select GENERIC_IRQ_SHOW
-
 menu "Platform setup"
 
 source arch/m68k/Kconfig.cpu