diff options
| author | Joerg Roedel <joerg.roedel@amd.com> | 2007-10-24 12:49:48 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2007-10-30 00:22:22 +0100 |
| commit | 966396d3a05c8049fce5c81c49138e5ee1b05443 (patch) | |
| tree | 11fff010a4aecd965bed52719d55d8fa4b40b055 /include/asm-x86 | |
| parent | 395624fcddd178de01a78aa88670a86ec919de77 (diff) | |
| download | linux-966396d3a05c8049fce5c81c49138e5ee1b05443.tar.gz linux-966396d3a05c8049fce5c81c49138e5ee1b05443.tar.bz2 linux-966396d3a05c8049fce5c81c49138e5ee1b05443.zip | |
x86 gart: rename CONFIG_IOMMU to CONFIG_GART_IOMMU
This patch renames the IOMMU config option to GART_IOMMU because in fact it
means the GART and not general support for an IOMMU on x86.
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Acked-by: Muli Ben-Yehuda <muli@il.ibm.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/asm-x86')
| -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); extern void no_iommu_init(void); extern int force_iommu, no_iommu; extern int iommu_detected; -#ifdef CONFIG_IOMMU +#ifdef CONFIG_GART_IOMMU extern void gart_iommu_init(void); extern void gart_iommu_shutdown(void); 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); */ #define PCI_DMA_BUS_IS_PHYS (dma_ops->is_phys) -#if defined(CONFIG_IOMMU) || defined(CONFIG_CALGARY_IOMMU) +#if defined(CONFIG_GART_IOMMU) || defined(CONFIG_CALGARY_IOMMU) #define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME) \ dma_addr_t ADDR_NAME; |