diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-20 16:30:01 +0900 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-20 16:30:01 +0900 |
commit | 6d90eb7ba341b3eb035121eff0b69d370cbc251e (patch) | |
tree | 332809825f5aab97e839ab4534e5b81fb28e0c84 /lib/Kconfig | |
parent | f5b65348fd77839b50e79bc0a5e536832ea52d8d (diff) | |
parent | cf65a0f6f6ff7631ba0ac0513a14ca5b65320d80 (diff) | |
download | op-kernel-dev-6d90eb7ba341b3eb035121eff0b69d370cbc251e.zip op-kernel-dev-6d90eb7ba341b3eb035121eff0b69d370cbc251e.tar.gz |
Merge tag 'dma-rename-4.18' of git://git.infradead.org/users/hch/dma-mapping
Pull dma-mapping rename from Christoph Hellwig:
"Move all the dma-mapping code to kernel/dma and lose their dma-*
prefixes"
* tag 'dma-rename-4.18' of git://git.infradead.org/users/hch/dma-mapping:
dma-mapping: move all DMA mapping code to kernel/dma
dma-mapping: use obj-y instead of lib-y for generic dma ops
Diffstat (limited to 'lib/Kconfig')
-rw-r--r-- | lib/Kconfig | 47 |
1 files changed, 1 insertions, 46 deletions
diff --git a/lib/Kconfig b/lib/Kconfig index e34b04b..706836e 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -420,60 +420,15 @@ config HAS_IOPORT_MAP depends on HAS_IOMEM && !NO_IOPORT_MAP default y -config HAS_DMA - bool - depends on !NO_DMA - default y +source "kernel/dma/Kconfig" config SGL_ALLOC bool default n -config NEED_SG_DMA_LENGTH - bool - -config NEED_DMA_MAP_STATE - bool - -config ARCH_DMA_ADDR_T_64BIT - def_bool 64BIT || PHYS_ADDR_T_64BIT - config IOMMU_HELPER bool -config ARCH_HAS_SYNC_DMA_FOR_DEVICE - bool - -config ARCH_HAS_SYNC_DMA_FOR_CPU - bool - select NEED_DMA_MAP_STATE - -config DMA_DIRECT_OPS - bool - depends on HAS_DMA - -config DMA_NONCOHERENT_OPS - bool - depends on HAS_DMA - select DMA_DIRECT_OPS - -config DMA_NONCOHERENT_MMAP - bool - depends on DMA_NONCOHERENT_OPS - -config DMA_NONCOHERENT_CACHE_SYNC - bool - depends on DMA_NONCOHERENT_OPS - -config DMA_VIRT_OPS - bool - depends on HAS_DMA - -config SWIOTLB - bool - select DMA_DIRECT_OPS - select NEED_DMA_MAP_STATE - config CHECK_SIGNATURE bool |