diff options
author | Joerg Roedel <joerg.roedel@amd.com> | 2007-10-24 06:49:48 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2007-10-29 19:22:22 -0400 |
commit | 966396d3a05c8049fce5c81c49138e5ee1b05443 (patch) | |
tree | 11fff010a4aecd965bed52719d55d8fa4b40b055 /arch/x86/configs | |
parent | 395624fcddd178de01a78aa88670a86ec919de77 (diff) |
x86 gart: rename CONFIG_IOMMU to CONFIG_GART_IOMMU
This patch renames the IOMMU config option to GART_IOMMU because in fact it
means the GART and not general support for an IOMMU on x86.
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Acked-by: Muli Ben-Yehuda <muli@il.ibm.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/configs')
-rw-r--r-- | arch/x86/configs/x86_64_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/configs/x86_64_defconfig b/arch/x86/configs/x86_64_defconfig index b091c5e35558..38a83f9c966f 100644 --- a/arch/x86/configs/x86_64_defconfig +++ b/arch/x86/configs/x86_64_defconfig | |||
@@ -170,7 +170,7 @@ CONFIG_HOTPLUG_CPU=y | |||
170 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 170 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
171 | CONFIG_HPET_TIMER=y | 171 | CONFIG_HPET_TIMER=y |
172 | CONFIG_HPET_EMULATE_RTC=y | 172 | CONFIG_HPET_EMULATE_RTC=y |
173 | CONFIG_IOMMU=y | 173 | CONFIG_GART_IOMMU=y |
174 | # CONFIG_CALGARY_IOMMU is not set | 174 | # CONFIG_CALGARY_IOMMU is not set |
175 | CONFIG_SWIOTLB=y | 175 | CONFIG_SWIOTLB=y |
176 | CONFIG_X86_MCE=y | 176 | CONFIG_X86_MCE=y |