Merge branch 'for-linus' of ssh://master.kernel.org/pub/scm/linux/kernel/git/ieee1394...

[pandora-kernel.git] / arch / s390 / Kconfig

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index eaed402..eaaac37 100644 (file)
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -7,6 +7,10 @@ config MMU
        bool
        default y
 
+config ZONE_DMA
+       bool
+       default y
+
 config LOCKDEP_SUPPORT
        bool
        default y
@@ -37,6 +41,9 @@ config GENERIC_HWEIGHT
 config GENERIC_TIME
        def_bool y
 
+config NO_IOMEM
+       def_bool y
+
 mainmenu "Linux Kernel Configuration"
 
 config S390