diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-10 10:43:11 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-10 10:43:11 +0200 |
| commit | 849567b9363dc8b90c369fff8acc245a1b47d94d (patch) | |
| tree | ea842f5deffb1ffa1379842d1d7328bd9f65673c | |
| parent | x86: make e820_end return end_of_ram again for 64bit (diff) | |
| parent | x86, iommu: replace CONFIG_IOMMU with CONFIG_GART_IOMMU in iommu.h (diff) | |
| download | linux-849567b9363dc8b90c369fff8acc245a1b47d94d.tar.xz linux-849567b9363dc8b90c369fff8acc245a1b47d94d.zip | |
Merge branch 'x86/gart' into x86/core
| -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); 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 *); |