projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4fac807
)
ia64: remove an ifdef around the content of pci-dma.c
author
Christoph Hellwig
<hch@lst.de>
Sun, 24 Dec 2017 13:04:37 +0000
(14:04 +0100)
committer
Christoph Hellwig
<hch@lst.de>
Mon, 15 Jan 2018 08:35:54 +0000
(09:35 +0100)
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>
arch/ia64/kernel/pci-dma.c
patch
|
blob
|
history
diff --git
a/arch/ia64/kernel/pci-dma.c
b/arch/ia64/kernel/pci-dma.c
index 35e0cad33b7d4b738c616b9c21a22ee2486d9e03..b5df084c0af40af307cc55690a1f95cb24bf092e 100644
(file)
--- 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