aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-10 10:43:11 +0200
committerIngo Molnar <mingo@elte.hu>2008-07-10 10:43:11 +0200
commit849567b9363dc8b90c369fff8acc245a1b47d94d (patch)
treeea842f5deffb1ffa1379842d1d7328bd9f65673c
parent3d43ecd286e442792f2e899e6e06eb23ab3d99f6 (diff)
parent8cbfd4f44d5c6cb1ba9e44f493c2f2a2c9b769d7 (diff)
Merge branch 'x86/gart' into x86/core
-rw-r--r--include/asm-x86/iommu.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-x86/iommu.h b/include/asm-x86/iommu.h
index 07862fdd23c..cb7e9891bfd 100644
--- 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 *);