diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-16 12:22:33 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-16 12:22:33 -0800 |
| commit | 1e3510b2b053b8253a99511efb668fcc7ae8fcd7 (patch) | |
| tree | 196d1d212e16fa2f7ddc9fee6a7ddfb3ed163c7e /arch | |
| parent | af27d9403f5b80685b79c88425086edccecaf711 (diff) | |
| parent | 7bcfab202ca71bece02b283cdd104301c07eece4 (diff) | |
Merge tag 'dma-mapping-4.16-2' of git://git.infradead.org/users/hch/dma-mapping
Pull dma-mapping fixes from Christoph Hellwig:
"A few dma-mapping fixes for the fallout from the changes in rc1"
* tag 'dma-mapping-4.16-2' of git://git.infradead.org/users/hch/dma-mapping:
powerpc/macio: set a proper dma_coherent_mask
dma-mapping: fix a comment typo
dma-direct: comment the dma_direct_free calling convention
dma-direct: mark as is_phys
ia64: fix build failure with CONFIG_SWIOTLB
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/ia64/kernel/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/ia64/kernel/Makefile b/arch/ia64/kernel/Makefile index 0b4c65a1af25..498f3da3f225 100644 --- a/arch/ia64/kernel/Makefile +++ b/arch/ia64/kernel/Makefile @@ -41,7 +41,6 @@ ifneq ($(CONFIG_IA64_ESI),) obj-y += esi_stub.o # must be in kernel proper endif obj-$(CONFIG_INTEL_IOMMU) += pci-dma.o -obj-$(CONFIG_SWIOTLB) += pci-swiotlb.o obj-$(CONFIG_BINFMT_ELF) += elfcore.o |