Merge branch 'x86/gart' into x86/core

849567b9 · Ingo Molnar · 3d43ecd2 · 8cbfd4f4 · 849567b9
隐藏空白更改
内联并排

Showing with 1 addition and 1 deletion

include/asm-x86/iommu.h include/asm-x86/iommu.h +1 -1

未找到文件。
--- 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 *);