[kernel] r14992 - in dists/trunk/linux-2.6/debian: . config/kernelarch-x86

[Bastian Blank]

Author: waldi
Date: Mon Jan 25 12:51:29 2010
New Revision: 14992

Log:
* debian/changelog: Update.
* debian/config/kernelarch-x86/config-arch-64:
  Make AGP and AGP_AMD64 again built-in.

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-64

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Sun Jan 24 12:08:42 2010	(r14991)
+++ dists/trunk/linux-2.6/debian/changelog	Mon Jan 25 12:51:29 2010	(r14992)
@@ -52,6 +52,8 @@
 
   [ Bastian Blank ]
   * Enable all NCP file system options.
+  * [amd64] Make AGP support again built-in to fullfill the not completely
+    documented dependency with GART IOMMU support. (closes: #561552)
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sun, 10 Jan 2010 17:38:50 +0000
 

Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-64
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-64	Sun Jan 24 12:08:42 2010	(r14991)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-64	Mon Jan 25 12:51:29 2010	(r14992)
@@ -61,6 +61,13 @@
 CONFIG_RIO_OLDPCI=y
 
 ##
+## file: drivers/char/agp/Kconfig
+##
+CONFIG_AGP=y
+#. Needed by GART_IOMMU
+CONFIG_AGP_AMD64=y
+
+##
 ## file: drivers/i2c/busses/Kconfig
 ##
 CONFIG_I2C_STUB=m