Merge branch 'x86/gart' into x86/core

git-mirror · Jul 10, 2008 · 849567b · 849567b
2 parents 3d43ecd + 8cbfd4f
commit 849567b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/include/asm-x86/iommu.h b/include/asm-x86/iommu.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 *);