Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe...

[linux-2.6] / arch / m32r / Kconfig

diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig
index 9740d6b8ae11c407ae56d4c88bf6b179056deceb..8ccf3e47bff8a1a79254a7d9a430514d818322ef 100644 (file)
--- a/arch/m32r/Kconfig
+++ b/arch/m32r/Kconfig
@@ -31,6 +31,9 @@ config GENERIC_IRQ_PROBE
 config NO_IOPORT
        def_bool y
 
+config NO_DMA
+       def_bool y
+
 source "init/Kconfig"
 
 
@@ -241,6 +244,10 @@ config GENERIC_CALIBRATE_DELAY
        bool
        default y
 
+config SCHED_NO_NO_OMIT_FRAME_POINTER
+        bool
+        default y
+
 config PREEMPT
        bool "Preemptible Kernel"
        help