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

[muen/linux.git] / arch / s390 / Kconfig

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 4f778af8323fbd4d157bd19a9864bd789f8721b7..b7deee7e738f59ac52a84d236b0ff4657783d3c8 100644 (file)
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -35,9 +35,6 @@ config GENERIC_BUG
 config GENERIC_BUG_RELATIVE_POINTERS
        def_bool y
 
-config ARCH_DMA_ADDR_T_64BIT
-       def_bool y
-
 config GENERIC_LOCKBREAK
        def_bool y if SMP && PREEMPT
 
@@ -133,7 +130,6 @@ config S390
        select HAVE_CMPXCHG_LOCAL
        select HAVE_COPY_THREAD_TLS
        select HAVE_DEBUG_KMEMLEAK
-       select HAVE_DMA_API_DEBUG
        select HAVE_DMA_CONTIGUOUS
        select DMA_DIRECT_OPS
        select HAVE_DYNAMIC_FTRACE
@@ -709,7 +705,11 @@ config QDIO
 menuconfig PCI
        bool "PCI support"
        select PCI_MSI
+       select IOMMU_HELPER
        select IOMMU_SUPPORT
+       select NEED_DMA_MAP_STATE
+       select NEED_SG_DMA_LENGTH
+
        help
          Enable PCI support.
 
@@ -733,15 +733,6 @@ config PCI_DOMAINS
 config HAS_IOMEM
        def_bool PCI
 
-config IOMMU_HELPER
-       def_bool PCI
-
-config NEED_SG_DMA_LENGTH
-       def_bool PCI
-
-config NEED_DMA_MAP_STATE
-       def_bool PCI
-
 config CHSC_SCH
        def_tristate m
        prompt "Support for CHSC subchannels"