diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-10 04:43:11 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-10 04:43:11 -0400 |
| commit | 849567b9363dc8b90c369fff8acc245a1b47d94d (patch) | |
| tree | ea842f5deffb1ffa1379842d1d7328bd9f65673c /include | |
| parent | 3d43ecd286e442792f2e899e6e06eb23ab3d99f6 (diff) | |
| parent | 8cbfd4f44d5c6cb1ba9e44f493c2f2a2c9b769d7 (diff) | |
Merge branch 'x86/gart' into x86/core
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-x86/iommu.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-x86/iommu.h b/include/asm-x86/iommu.h index 07862fdd23c0..cb7e9891bfd2 100644 --- a/include/asm-x86/iommu.h +++ b/include/asm-x86/iommu.h | |||
| @@ -5,7 +5,7 @@ extern void pci_iommu_shutdown(void); | |||
| 5 | extern void no_iommu_init(void); | 5 | extern void no_iommu_init(void); |
| 6 | extern int force_iommu, no_iommu; | 6 | extern int force_iommu, no_iommu; |
| 7 | extern int iommu_detected; | 7 | extern int iommu_detected; |
| 8 | #ifdef CONFIG_IOMMU | 8 | #ifdef CONFIG_GART_IOMMU |
| 9 | extern void gart_iommu_init(void); | 9 | extern void gart_iommu_init(void); |
| 10 | extern void gart_iommu_shutdown(void); | 10 | extern void gart_iommu_shutdown(void); |
| 11 | extern void __init gart_parse_options(char *); | 11 | extern void __init gart_parse_options(char *); |