Merge branch 'x86/cpufeature' into irq/numa

[sfrench/cifs-2.6.git] / arch / Kconfig

diff --git a/arch/Kconfig b/arch/Kconfig
index 830c16a2b801d38795139b941f277011e760ba37..78a35e9dc10407e24eeeabe6f2331a9ff24b64b7 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -6,6 +6,7 @@ config OPROFILE
        tristate "OProfile system profiling (EXPERIMENTAL)"
        depends on PROFILING
        depends on HAVE_OPROFILE
+       depends on TRACING_SUPPORT
        select TRACING
        select RING_BUFFER
        help
@@ -108,3 +109,6 @@ config HAVE_CLK
 
 config HAVE_DMA_API_DEBUG
        bool
+
+config HAVE_DEFAULT_NO_SPIN_MUTEXES
+       bool