Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6

[net-next-2.6.git] / arch / s390 / Kconfig

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 21a7030abbb4e5c87c143731455ab86c8f6cfe75..fabb40bc4e196adcb578e86f6558e008c27f1199 100644 (file)
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -1,8 +1,3 @@
-#
-# For a description of the syntax of this configuration file,
-# see Documentation/kbuild/kconfig-language.txt.
-#
-
 config SCHED_MC
        def_bool y
        depends on SMP
@@ -60,6 +55,9 @@ config NO_IOMEM
 config NO_DMA
        def_bool y
 
+config ARCH_DMA_ADDR_T_64BIT
+       def_bool 64BIT
+
 config GENERIC_LOCKBREAK
        bool
        default y
@@ -75,8 +73,6 @@ config VIRT_CPU_ACCOUNTING
 config ARCH_SUPPORTS_DEBUG_PAGEALLOC
        def_bool y
 
-mainmenu "Linux Kernel Configuration"
-
 config S390
        def_bool y
        select USE_GENERIC_SMP_HELPERS if SMP