Merge branch 'linus' into perfcounters/core

[mv-sheeva.git] / arch / Kconfig

diff --git a/arch/Kconfig b/arch/Kconfig
index a092dc77c24d637f9fecaba0d8c4c017c001ea6d..78a35e9dc10407e24eeeabe6f2331a9ff24b64b7 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -107,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