Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

[pandora-kernel.git] / arch / Kconfig

diff --git a/arch/Kconfig b/arch/Kconfig
index f78c2be..26b0e23 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -144,9 +144,6 @@ config HAVE_CLK
 config HAVE_DMA_API_DEBUG
        bool
 
-config HAVE_DEFAULT_NO_SPIN_MUTEXES
-       bool
-
 config HAVE_HW_BREAKPOINT
        bool
        depends on PERF_EVENTS
@@ -178,4 +175,7 @@ config HAVE_ARCH_JUMP_LABEL
 config HAVE_ARCH_MUTEX_CPU_RELAX
        bool
 
+config HAVE_RCU_TABLE_FREE
+       bool
+
 source "kernel/gcov/Kconfig"