summaryrefslogtreecommitdiff
path: root/arch/x86/kernel/pci-dma_64.c
diff options
context:
space:
mode:
authorJoerg Roedel <joerg.roedel@amd.com>2007-10-24 12:49:48 +0200
committerThomas Gleixner <tglx@linutronix.de>2007-10-30 00:22:22 +0100
commit966396d3a05c8049fce5c81c49138e5ee1b05443 (patch)
tree11fff010a4aecd965bed52719d55d8fa4b40b055 /arch/x86/kernel/pci-dma_64.c
parent395624fcddd178de01a78aa88670a86ec919de77 (diff)
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 'arch/x86/kernel/pci-dma_64.c')
-rw-r--r--arch/x86/kernel/pci-dma_64.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/pci-dma_64.c b/arch/x86/kernel/pci-dma_64.c
index 730339fc00da..66b3dc5b3f45 100644
--- a/arch/x86/kernel/pci-dma_64.c
+++ b/arch/x86/kernel/pci-dma_64.c
@@ -275,7 +275,7 @@ __init int iommu_setup(char *p)
swiotlb = 1;
#endif
-#ifdef CONFIG_IOMMU
+#ifdef CONFIG_GART_IOMMU
gart_parse_options(p);
#endif
@@ -298,7 +298,7 @@ void __init pci_iommu_alloc(void)
* The order of these functions is important for
* fall-back/fail-over reasons
*/
-#ifdef CONFIG_IOMMU
+#ifdef CONFIG_GART_IOMMU
iommu_hole_init();
#endif
@@ -321,7 +321,7 @@ static int __init pci_iommu_init(void)
intel_iommu_init();
-#ifdef CONFIG_IOMMU
+#ifdef CONFIG_GART_IOMMU
gart_iommu_init();
#endif