diff options
Diffstat (limited to 'arch/x86/kernel/pci-dma_64.c')
-rw-r--r-- | arch/x86/kernel/pci-dma_64.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/x86/kernel/pci-dma_64.c b/arch/x86/kernel/pci-dma_64.c index 393e2725a6e3..aa805b11b24f 100644 --- a/arch/x86/kernel/pci-dma_64.c +++ b/arch/x86/kernel/pci-dma_64.c | |||
@@ -9,7 +9,7 @@ | |||
9 | #include <linux/module.h> | 9 | #include <linux/module.h> |
10 | #include <linux/dmar.h> | 10 | #include <linux/dmar.h> |
11 | #include <asm/io.h> | 11 | #include <asm/io.h> |
12 | #include <asm/iommu.h> | 12 | #include <asm/gart.h> |
13 | #include <asm/calgary.h> | 13 | #include <asm/calgary.h> |
14 | 14 | ||
15 | int iommu_merge __read_mostly = 1; | 15 | int iommu_merge __read_mostly = 1; |
@@ -275,7 +275,7 @@ __init int iommu_setup(char *p) | |||
275 | swiotlb = 1; | 275 | swiotlb = 1; |
276 | #endif | 276 | #endif |
277 | 277 | ||
278 | #ifdef CONFIG_IOMMU | 278 | #ifdef CONFIG_GART_IOMMU |
279 | gart_parse_options(p); | 279 | gart_parse_options(p); |
280 | #endif | 280 | #endif |
281 | 281 | ||
@@ -298,8 +298,8 @@ void __init pci_iommu_alloc(void) | |||
298 | * The order of these functions is important for | 298 | * The order of these functions is important for |
299 | * fall-back/fail-over reasons | 299 | * fall-back/fail-over reasons |
300 | */ | 300 | */ |
301 | #ifdef CONFIG_IOMMU | 301 | #ifdef CONFIG_GART_IOMMU |
302 | iommu_hole_init(); | 302 | gart_iommu_hole_init(); |
303 | #endif | 303 | #endif |
304 | 304 | ||
305 | #ifdef CONFIG_CALGARY_IOMMU | 305 | #ifdef CONFIG_CALGARY_IOMMU |
@@ -321,7 +321,7 @@ static int __init pci_iommu_init(void) | |||
321 | 321 | ||
322 | intel_iommu_init(); | 322 | intel_iommu_init(); |
323 | 323 | ||
324 | #ifdef CONFIG_IOMMU | 324 | #ifdef CONFIG_GART_IOMMU |
325 | gart_iommu_init(); | 325 | gart_iommu_init(); |
326 | #endif | 326 | #endif |
327 | 327 | ||