commit efd44318157009274fa5962d60167ecfb954e246
author Joerg Roedel <joerg.roedel@amd.com> Fri Nov 27 14:27:30 2009 +0100
committer Joerg Roedel <joerg.roedel@amd.com> Fri Nov 27 14:27:30 2009 +0100
tree 8fad639260cd34f46210b4731e2d4712a0774957
parent 492667dacc0ac9763969155482b1261b34ccf450
parent 4f65ae36f0291ef97b7d4de2f59b2e68f3c8420b

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

drivers/char/agp/Kconfig

diff --git a/drivers/char/agp/Kconfig b/drivers/char/agp/Kconfig
index ccb1fa8..2fb3a48 100644
--- a/drivers/char/agp/Kconfig
+++ b/drivers/char/agp/Kconfig
@@ -56,9 +56,8 @@
 	  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.