From 4be8a67ec17eb8a251c739f7961a7c584b9f2315 Mon Sep 17 00:00:00 2001 From: Roman Zippel Date: Thu, 22 Jun 2006 14:47:35 -0700 Subject: [PATCH] --- yaml --- r: 28573 b: refs/heads/master c: dcc1a66a09420ccc5a22671bddc5a842f92d67e5 h: refs/heads/master i: 28571: ff02fa46b7e16c98c5f688d0a4a93866f1b6f287 v: v3 --- [refs] | 2 +- trunk/arch/x86_64/Kconfig | 5 ++--- trunk/drivers/char/agp/Kconfig | 3 +-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 9f58565f862d..919e50cab378 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4f3865fb57a04db7cca068fed1c15badc064a302 +refs/heads/master: dcc1a66a09420ccc5a22671bddc5a842f92d67e5 diff --git a/trunk/arch/x86_64/Kconfig b/trunk/arch/x86_64/Kconfig index 408d44a59756..7d3bc5ac5db0 100644 --- a/trunk/arch/x86_64/Kconfig +++ b/trunk/arch/x86_64/Kconfig @@ -389,6 +389,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 @@ -401,11 +402,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 --git a/trunk/drivers/char/agp/Kconfig b/trunk/drivers/char/agp/Kconfig index 7c88c060a9e6..46685a540772 100644 --- a/trunk/drivers/char/agp/Kconfig +++ b/trunk/drivers/char/agp/Kconfig @@ -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.