Merge branch 'for-v3.18' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping

Pull dma-mapping update from Marek Szyprowski:
 "Provide the dma write coherent api (available previously on ARM
  architecture) for all other architectures, which use dma_ops-based dma
  mapping implementation.

  This lets one to use the same code in the device drivers regardless of
  the selected architecture"

* 'for-v3.18' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
  dma-mapping: Provide write-combine allocations
  s390: Implement dma_{alloc,free}_attrs()

1 files changed, 1 insertions, 4 deletions

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 05c78bb5f570..296391395b95 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -496,8 +496,8 @@ config QDIO
 
 menuconfig PCI
         bool "PCI support"
-        default n
         depends on 64BIT
+        select HAVE_DMA_ATTRS
         select PCI_MSI
         help
           Enable PCI support.
@@ -544,9 +544,6 @@ config HAS_DMA
 config NEED_SG_DMA_LENGTH
         def_bool PCI
 
-config HAVE_DMA_ATTRS
-        def_bool PCI
-
 config NEED_DMA_MAP_STATE
         def_bool PCI