[PATCH 15/22] ia64: remove an ifdef around the content of pci-dma.c
From: hch@lst.de (Christoph Hellwig)
Date: 2018-01-10 08:12:34
Also in:
linux-arch, linux-iommu, linux-mips, linuxppc-dev, lkml
Subsystem:
the rest · Maintainer:
Linus Torvalds
The file is only compiled if CONFIG_INTEL_IOMMU is set to start with. Signed-off-by: Christoph Hellwig <hch@lst.de> --- arch/ia64/kernel/pci-dma.c | 7 ------- 1 file changed, 7 deletions(-)
diff --git a/arch/ia64/kernel/pci-dma.c b/arch/ia64/kernel/pci-dma.c
index 35e0cad33b7d..b5df084c0af4 100644
--- a/arch/ia64/kernel/pci-dma.c
+++ b/arch/ia64/kernel/pci-dma.c@@ -12,12 +12,7 @@ #include <asm/iommu.h> #include <asm/machvec.h> #include <linux/dma-mapping.h> - - -#ifdef CONFIG_INTEL_IOMMU - #include <linux/kernel.h> - #include <asm/page.h> dma_addr_t bad_dma_address __read_mostly;
@@ -115,5 +110,3 @@ void __init pci_iommu_alloc(void) } #endif /* CONFIG_SWIOTLB */ } - -#endif
--
2.14.2