Signed-off-by: Andrew Morton --- arch/x86_64/Kconfig | 5 ++--- drivers/char/agp/Kconfig | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff -puN arch/x86_64/Kconfig~x86_64-mm-agp-select arch/x86_64/Kconfig --- devel/arch/x86_64/Kconfig~x86_64-mm-agp-select 2006-05-19 16:00:18.000000000 -0700 +++ devel-akpm/arch/x86_64/Kconfig 2006-05-19 16:00:18.000000000 -0700 @@ -390,6 +390,7 @@ config GART_IOMMU bool "K8 GART IOMMU support" default y select SWIOTLB + select AGP depends on PCI help Support for hardware IOMMU in AMD's Opteron/Athlon64 Processors @@ -402,11 +403,9 @@ config GART_IOMMU northbridge and a software emulation used on other systems without hardware IOMMU. If unsure, say Y. -# need this always enabled with GART_IOMMU for the VIA workaround +# need this always selected by GART_IOMMU for the VIA workaround config SWIOTLB bool - default y - depends on GART_IOMMU config X86_MCE bool "Machine check support" if EMBEDDED diff -puN drivers/char/agp/Kconfig~x86_64-mm-agp-select drivers/char/agp/Kconfig --- devel/drivers/char/agp/Kconfig~x86_64-mm-agp-select 2006-05-19 16:00:18.000000000 -0700 +++ devel-akpm/drivers/char/agp/Kconfig 2006-05-19 16:00:18.000000000 -0700 @@ -1,7 +1,6 @@ config AGP - tristate "/dev/agpgart (AGP Support)" if !GART_IOMMU + tristate "/dev/agpgart (AGP Support)" depends on ALPHA || IA64 || PPC || X86 - default y if GART_IOMMU ---help--- AGP (Accelerated Graphics Port) is a bus system mainly used to connect graphics cards to the rest of the system. _