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

[Bastian Blank]

Author: waldi
Date: Fri Dec  4 17:35:58 2009
New Revision: 14733

Log:
* debian/changelog: Update.
* debian/config/kernelarch-x86/config: Set AGP and AGP_AMD64 to module.
* debian/config/kernelarch-x86/config-arch-32,
  debian/config/kernelarch-x86/config-arch-64: Remove duplicated options.

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
   dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-32
   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	Fri Dec  4 17:29:29 2009	(r14732)
+++ dists/trunk/linux-2.6/debian/changelog	Fri Dec  4 17:35:58 2009	(r14733)
@@ -20,6 +20,7 @@
   * Always enable software watchdog support.
   * Always enable complete USB mass storage support.
   * [amd64, powerpc, sparc] Build USB support as module.
+  * [amd64] Build AGP support as module.
   
   [ Ben Hutchings ]
   * Re-enable accidentally omitted drivers, thanks to Uwe Kleine-König

Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Fri Dec  4 17:29:29 2009	(r14732)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Fri Dec  4 17:35:58 2009	(r14733)
@@ -263,6 +263,8 @@
 ##
 ## file: drivers/char/agp/Kconfig
 ##
+CONFIG_AGP=m
+CONFIG_AGP_AMD64=m
 CONFIG_AGP_INTEL=m
 CONFIG_AGP_SIS=m
 CONFIG_AGP_VIA=m

Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-32
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-32	Fri Dec  4 17:29:29 2009	(r14732)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-32	Fri Dec  4 17:35:58 2009	(r14733)
@@ -125,11 +125,9 @@
 ##
 ## file: drivers/char/agp/Kconfig
 ##
-CONFIG_AGP=m
 CONFIG_AGP_ALI=m
 CONFIG_AGP_ATI=m
 CONFIG_AGP_AMD=m
-CONFIG_AGP_AMD64=m
 CONFIG_AGP_NVIDIA=m
 CONFIG_AGP_SWORKS=m
 CONFIG_AGP_EFFICEON=m

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	Fri Dec  4 17:29:29 2009	(r14732)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-64	Fri Dec  4 17:35:58 2009	(r14733)
@@ -57,12 +57,6 @@
 CONFIG_RIO_OLDPCI=y
 
 ##
-## file: drivers/char/agp/Kconfig
-##
-CONFIG_AGP=y
-CONFIG_AGP_AMD64=y
-
-##
 ## file: drivers/i2c/busses/Kconfig
 ##
 CONFIG_I2C_STUB=m