diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-x86/gart.h | 2 | ||||
-rw-r--r-- | include/asm-x86/pci_64.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-x86/gart.h b/include/asm-x86/gart.h index 5af471f228ee..0765f3d67851 100644 --- a/include/asm-x86/gart.h +++ b/include/asm-x86/gart.h | |||
@@ -5,7 +5,7 @@ extern void pci_iommu_shutdown(void); | |||
5 | extern void no_iommu_init(void); | 5 | extern void no_iommu_init(void); |
6 | extern int force_iommu, no_iommu; | 6 | extern int force_iommu, no_iommu; |
7 | extern int iommu_detected; | 7 | extern int iommu_detected; |
8 | #ifdef CONFIG_IOMMU | 8 | #ifdef CONFIG_GART_IOMMU |
9 | extern void gart_iommu_init(void); | 9 | extern void gart_iommu_init(void); |
10 | extern void gart_iommu_shutdown(void); | 10 | extern void gart_iommu_shutdown(void); |
11 | extern void __init gart_parse_options(char *); | 11 | extern void __init gart_parse_options(char *); |
diff --git a/include/asm-x86/pci_64.h b/include/asm-x86/pci_64.h index 9baa46d9f594..ef54226a9325 100644 --- a/include/asm-x86/pci_64.h +++ b/include/asm-x86/pci_64.h | |||
@@ -37,7 +37,7 @@ extern int iommu_setup(char *opt); | |||
37 | */ | 37 | */ |
38 | #define PCI_DMA_BUS_IS_PHYS (dma_ops->is_phys) | 38 | #define PCI_DMA_BUS_IS_PHYS (dma_ops->is_phys) |
39 | 39 | ||
40 | #if defined(CONFIG_IOMMU) || defined(CONFIG_CALGARY_IOMMU) | 40 | #if defined(CONFIG_GART_IOMMU) || defined(CONFIG_CALGARY_IOMMU) |
41 | 41 | ||
42 | #define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME) \ | 42 | #define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME) \ |
43 | dma_addr_t ADDR_NAME; | 43 | dma_addr_t ADDR_NAME; |