Merge branch 'linus'; commit 'v3.0-rc2' into next

[deliverable/linux.git] / kernel / Kconfig.locks

diff --git a/kernel/Kconfig.locks b/kernel/Kconfig.locks
index 88c92fb4461897f06042f599bd1017c3e7a1148d..5068e2a4e75f05f3c1b823b79ae67c94ffc09130 100644 (file)
--- a/kernel/Kconfig.locks
+++ b/kernel/Kconfig.locks
@@ -199,4 +199,4 @@ config INLINE_WRITE_UNLOCK_IRQRESTORE
        def_bool !DEBUG_SPINLOCK && ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE
 
 config MUTEX_SPIN_ON_OWNER
-       def_bool SMP && !DEBUG_MUTEXES && !HAVE_DEFAULT_NO_SPIN_MUTEXES
+       def_bool SMP && !DEBUG_MUTEXES