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

mariux64 · Nov 27, 2009 · efd4431 · efd4431
2 parents 492667d + 4f65ae3
commit efd4431
Showing 1 changed file with 1 addition and 2 deletions.
diff --git 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.