diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-10 16:56:08 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-10 16:56:08 -0400 |
| commit | 754c780953397dd5ee5191b7b3ca67e09088ce7a (patch) | |
| tree | 8bdbf8407c8cd917f24a0d5a5c6a865db6366f3c /arch/s390/Kconfig | |
| parent | 40c43269cf8e88a0bdc306c717d1dd5446a6f3b8 (diff) | |
| parent | b4bbb107d73bbc0d92c9ae7fd8e69580aa9381e7 (diff) | |
| download | op-kernel-dev-754c780953397dd5ee5191b7b3ca67e09088ce7a.zip op-kernel-dev-754c780953397dd5ee5191b7b3ca67e09088ce7a.tar.gz | |
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()
Diffstat (limited to 'arch/s390/Kconfig')
| -rw-r--r-- | arch/s390/Kconfig | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index 05c78bb..2963913 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 |
