Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq

[linux-2.6] / arch / Kconfig

diff --git a/arch/Kconfig b/arch/Kconfig
index 3d72dc3fc8f52f5d822cc6c256e21fb21e2b4f61..ad89a33d8c6ef66acb166e49fa423659e18afc9c 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -27,5 +27,18 @@ config KPROBES
          for kernel debugging, non-intrusive instrumentation and testing.
          If in doubt, say "N".
 
+config KRETPROBES
+       def_bool y
+       depends on KPROBES && HAVE_KRETPROBES
+
 config HAVE_KPROBES
        def_bool n
+
+config HAVE_KRETPROBES
+       def_bool n
+
+config HAVE_DMA_ATTRS
+       def_bool n
+
+config USE_GENERIC_SMP_HELPERS
+       def_bool n