Merge branch 'x86-urgent-for-linus' of git://tesla.tglx.de/git/linux-2.6-tip

[karo-tx-linux.git] / arch / m68k / Kconfig

diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index 284cd3771eaaf7b1b0c1f3fd5a35789c116954eb..9e8ee9d2b8ca3c55ce540aee8addcbf308ea9e06 100644 (file)
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -6,6 +6,7 @@ config M68K
        select GENERIC_ATOMIC64 if MMU
        select HAVE_GENERIC_HARDIRQS if !MMU
        select GENERIC_IRQ_SHOW if !MMU
+       select ARCH_HAVE_NMI_SAFE_CMPXCHG if RMW_INSNS
 
 config RWSEM_GENERIC_SPINLOCK
        bool