Merge branch 'for_linus' of git://git.infradead.org/~dedekind/ubifs-2.6

[pandora-kernel.git] / arch / Kconfig

diff --git a/arch/Kconfig b/arch/Kconfig
index 3d72dc3..ad89a33 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