diff options
| author | Joerg Roedel <joerg.roedel@amd.com> | 2009-11-27 08:27:30 -0500 |
|---|---|---|
| committer | Joerg Roedel <joerg.roedel@amd.com> | 2009-11-27 08:27:30 -0500 |
| commit | efd44318157009274fa5962d60167ecfb954e246 (patch) | |
| tree | 8fad639260cd34f46210b4731e2d4712a0774957 /drivers/char | |
| parent | 492667dacc0ac9763969155482b1261b34ccf450 (diff) | |
| parent | 4f65ae36f0291ef97b7d4de2f59b2e68f3c8420b (diff) | |
Merge branch 'gart/fixes' into amd-iommu/2.6.33
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/agp/Kconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/char/agp/Kconfig b/drivers/char/agp/Kconfig index ccb1fa89de29..2fb3a480f6b0 100644 --- a/drivers/char/agp/Kconfig +++ b/drivers/char/agp/Kconfig | |||
| @@ -56,9 +56,8 @@ config AGP_AMD | |||
| 56 | X on AMD Irongate, 761, and 762 chipsets. | 56 | X on AMD Irongate, 761, and 762 chipsets. |
| 57 | 57 | ||
| 58 | config AGP_AMD64 | 58 | config AGP_AMD64 |
| 59 | tristate "AMD Opteron/Athlon64 on-CPU GART support" if !GART_IOMMU | 59 | tristate "AMD Opteron/Athlon64 on-CPU GART support" |
| 60 | depends on AGP && X86 | 60 | depends on AGP && X86 |
| 61 | default y if GART_IOMMU | ||
| 62 | help | 61 | help |
| 63 | This option gives you AGP support for the GLX component of | 62 | This option gives you AGP support for the GLX component of |
| 64 | X using the on-CPU northbridge of the AMD Athlon64/Opteron CPUs. | 63 | X using the on-CPU northbridge of the AMD Athlon64/Opteron CPUs. |