diff options
-rw-r--r-- | arch/x86/kernel/pci-dma.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c index dd57c5bbe2da..f16cbbe424a1 100644 --- a/arch/x86/kernel/pci-dma.c +++ b/arch/x86/kernel/pci-dma.c | |||
@@ -116,9 +116,7 @@ void __init pci_iommu_alloc(void) | |||
116 | */ | 116 | */ |
117 | gart_iommu_hole_init(); | 117 | gart_iommu_hole_init(); |
118 | 118 | ||
119 | #ifdef CONFIG_CALGARY_IOMMU | ||
120 | detect_calgary(); | 119 | detect_calgary(); |
121 | #endif | ||
122 | 120 | ||
123 | detect_intel_iommu(); | 121 | detect_intel_iommu(); |
124 | 122 | ||
@@ -496,9 +494,7 @@ EXPORT_SYMBOL(dma_free_coherent); | |||
496 | 494 | ||
497 | static int __init pci_iommu_init(void) | 495 | static int __init pci_iommu_init(void) |
498 | { | 496 | { |
499 | #ifdef CONFIG_CALGARY_IOMMU | ||
500 | calgary_iommu_init(); | 497 | calgary_iommu_init(); |
501 | #endif | ||
502 | 498 | ||
503 | intel_iommu_init(); | 499 | intel_iommu_init(); |
504 | 500 | ||