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/Kconfig.x86_64 | |
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/Kconfig.x86_64')
-rw-r--r-- | arch/x86/Kconfig.x86_64 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/Kconfig.x86_64 b/arch/x86/Kconfig.x86_64 index acb2949dbebc..60ac22769a40 100644 --- a/arch/x86/Kconfig.x86_64 +++ b/arch/x86/Kconfig.x86_64 | |||
@@ -479,7 +479,7 @@ config HPET_EMULATE_RTC | |||
479 | 479 | ||
480 | # Mark as embedded because too many people got it wrong. | 480 | # Mark as embedded because too many people got it wrong. |
481 | # The code disables itself when not needed. | 481 | # The code disables itself when not needed. |
482 | config IOMMU | 482 | config GART_IOMMU |
483 | bool "GART IOMMU support" if EMBEDDED | 483 | bool "GART IOMMU support" if EMBEDDED |
484 | default y | 484 | default y |
485 | select SWIOTLB | 485 | select SWIOTLB |
@@ -687,7 +687,7 @@ source kernel/Kconfig.hz | |||
687 | 687 | ||
688 | config K8_NB | 688 | config K8_NB |
689 | def_bool y | 689 | def_bool y |
690 | depends on AGP_AMD64 || IOMMU || (PCI && NUMA) | 690 | depends on AGP_AMD64 || GART_IOMMU || (PCI && NUMA) |
691 | 691 | ||
692 | endmenu | 692 | endmenu |
693 | 693 | ||