Merge branch 'gart/fixes' into amd-iommu/2.6.33

efd44318 · Joerg Roedel · 492667da · 4f65ae36 · efd44318
Commit efd44318 authored Nov 27, 2009 by Joerg Roedel
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

drivers/char/agp/Kconfig drivers/char/agp/Kconfig +1 -2

No files found.
--- a/drivers/char/agp/Kconfig
+++ b/drivers/char/agp/Kconfig
@@ -56,9 +56,8 @@ config AGP_AMD
 	  X on AMD Irongate, 761, and 762 chipsets.

 config AGP_AMD64
-	tristate "AMD Opteron/Athlon64 on-CPU GART support" if !GART_IOMMU
+	tristate "AMD Opteron/Athlon64 on-CPU GART support"
 	depends on AGP && X86
-	default y if GART_IOMMU
 	help
 	  This option gives you AGP support for the GLX component of
 	  X using the on-CPU northbridge of the AMD Athlon64/Opteron CPUs.