aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86_64/Kconfig
diff options
context:
space:
mode:
authorRoman Zippel <zippel@linux-m68k.org>2006-06-22 17:47:35 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-22 18:05:58 -0400
commitdcc1a66a09420ccc5a22671bddc5a842f92d67e5 (patch)
tree612610869ea027b80b721a0f205d217792b95f3d /arch/x86_64/Kconfig
parent4f3865fb57a04db7cca068fed1c15badc064a302 (diff)
[PATCH] x86_64: use select for GART_IOMMU to enable AGP
The AGP default doesn't work well with other selects, so use a select for GART_IOMMU as well. Remove a redundant default for SWIOTLB as well. Signed-off-by: Roman Zippel <zippel@linux-m68k.org> Signed-off-by: Andi Kleen <ak@suse.de> Cc: Andi Kleen <ak@muc.de> Cc: Dave Jones <davej@codemonkey.org.uk> Cc: Dave Airlie <airlied@linux.ie> Cc: Jeff Garzik <jeff@garzik.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/x86_64/Kconfig')
-rw-r--r--arch/x86_64/Kconfig5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig
index 408d44a5975..7d3bc5ac5db 100644
--- a/arch/x86_64/Kconfig
+++ b/arch/x86_64/Kconfig
@@ -389,6 +389,7 @@ config GART_IOMMU
389 bool "K8 GART IOMMU support" 389 bool "K8 GART IOMMU support"
390 default y 390 default y
391 select SWIOTLB 391 select SWIOTLB
392 select AGP
392 depends on PCI 393 depends on PCI
393 help 394 help
394 Support for hardware IOMMU in AMD's Opteron/Athlon64 Processors 395 Support for hardware IOMMU in AMD's Opteron/Athlon64 Processors
@@ -401,11 +402,9 @@ config GART_IOMMU
401 northbridge and a software emulation used on other systems without 402 northbridge and a software emulation used on other systems without
402 hardware IOMMU. If unsure, say Y. 403 hardware IOMMU. If unsure, say Y.
403 404
404# need this always enabled with GART_IOMMU for the VIA workaround 405# need this always selected by GART_IOMMU for the VIA workaround
405config SWIOTLB 406config SWIOTLB
406 bool 407 bool
407 default y
408 depends on GART_IOMMU
409 408
410config X86_MCE 409config X86_MCE
411 bool "Machine check support" if EMBEDDED 410 bool "Machine check support" if EMBEDDED