Merge branch 'linus' into perfcounters/core

[mv-sheeva.git] / arch / Kconfig

diff --git a/arch/Kconfig b/arch/Kconfig
index 550dab22daa14b492d88258c9eb8ae7498d76ec1..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
@@ -106,3 +107,8 @@ config HAVE_CLK
          The <linux/clk.h> calls support software clock gating and
          thus are a key power management tool on many systems.
 
+config HAVE_DMA_API_DEBUG
+       bool
+
+config HAVE_DEFAULT_NO_SPIN_MUTEXES
+       bool