Prechádzať zdrojové kódy

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

Joerg Roedel 15 rokov pred
rodič
commit
efd4431815
1 zmenil súbory, kde vykonal 1 pridanie a 2 odobranie
  1. 1 2
      drivers/char/agp/Kconfig

+ 1 - 2
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.