summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2017-12-24 14:04:37 +0100
committerChristoph Hellwig <hch@lst.de>2018-01-15 09:35:54 +0100
commit35bd5071206e4974aed9bbd229d68699e72306ec (patch)
tree4f9edb16a27662c2c40080aac5c887ae1c6b6974
parent4fac8076df854aa4ddb8acbf6cce9d337300219e (diff)
downloadop-kernel-dev-35bd5071206e4974aed9bbd229d68699e72306ec.zip
op-kernel-dev-35bd5071206e4974aed9bbd229d68699e72306ec.tar.gz
ia64: remove an ifdef around the content of pci-dma.c
The file is only compiled if CONFIG_INTEL_IOMMU is set to start with. Signed-off-by: Christoph Hellwig <hch@lst.de> Acked-by: Christian König <christian.koenig@amd.com>
-rw-r--r--arch/ia64/kernel/pci-dma.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/ia64/kernel/pci-dma.c b/arch/ia64/kernel/pci-dma.c
index 35e0cad..b5df084 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
OpenPOWER on IntegriCloud