aboutsummaryrefslogtreecommitdiff
path: root/drivers/char
diff options
context:
space:
mode:
authorJoerg Roedel <joerg.roedel@amd.com>2009-11-27 14:27:30 +0100
committerJoerg Roedel <joerg.roedel@amd.com>2009-11-27 14:27:30 +0100
commitefd44318157009274fa5962d60167ecfb954e246 (patch)
tree8fad639260cd34f46210b4731e2d4712a0774957 /drivers/char
parent492667dacc0ac9763969155482b1261b34ccf450 (diff)
parent4f65ae36f0291ef97b7d4de2f59b2e68f3c8420b (diff)
Merge branch 'gart/fixes' into amd-iommu/2.6.33
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/agp/Kconfig3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/char/agp/Kconfig b/drivers/char/agp/Kconfig
index ccb1fa89de2..2fb3a480f6b 100644
--- 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.