[kernel] r15401 - in dists/sid/linux-2.6/debian: . config/alpha config/ia64 config/kernelarch-x86 config/powerpc

[Bastian Blank]

Author: waldi
Date: Tue Mar 16 19:14:45 2010
New Revision: 15401

Log:
* debian/changelog: Update.
* debian/config: Make all AGP driver built-in to workaround race-condition
  between DRM and AGP.

Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/config/alpha/config
   dists/sid/linux-2.6/debian/config/ia64/config
   dists/sid/linux-2.6/debian/config/kernelarch-x86/config
   dists/sid/linux-2.6/debian/config/kernelarch-x86/config-arch-32
   dists/sid/linux-2.6/debian/config/powerpc/config

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Tue Mar 16 18:52:55 2010	(r15400)
+++ dists/sid/linux-2.6/debian/changelog	Tue Mar 16 19:14:45 2010	(r15401)
@@ -28,6 +28,8 @@
      #519586, #520702, #522452, #524571, #524596, #526695, #533132, #533432,
      #534880, #534978, #541227, #542299, #542614, #543489, #544525, #548345,
      #554564, #554621, #559175, #559634)
+  * [alpha, amd64, i386, amd64, powerpc] Make all AGP driver built-in to
+    workaround race-condition between DRM and AGP.
 
   [ Ben Hutchings ]
   * drm: Apply all changes from 2.6.33 and 2.6.33.1:

Modified: dists/sid/linux-2.6/debian/config/alpha/config
==============================================================================
--- dists/sid/linux-2.6/debian/config/alpha/config	Tue Mar 16 18:52:55 2010	(r15400)
+++ dists/sid/linux-2.6/debian/config/alpha/config	Tue Mar 16 19:14:45 2010	(r15401)
@@ -167,10 +167,10 @@
 ##
 ## file: drivers/char/agp/Kconfig
 ##
-CONFIG_AGP=m
-CONFIG_AGP_SIS=m
-CONFIG_AGP_VIA=m
-CONFIG_AGP_ALPHA_CORE=m
+#. Workaround
+CONFIG_AGP=y
+#. Workaround
+CONFIG_AGP_ALPHA_CORE=y
 
 ##
 ## file: drivers/char/ipmi/Kconfig

Modified: dists/sid/linux-2.6/debian/config/ia64/config
==============================================================================
--- dists/sid/linux-2.6/debian/config/ia64/config	Tue Mar 16 18:52:55 2010	(r15400)
+++ dists/sid/linux-2.6/debian/config/ia64/config	Tue Mar 16 19:14:45 2010	(r15401)
@@ -102,12 +102,14 @@
 ##
 ## file: drivers/char/agp/Kconfig
 ##
-CONFIG_AGP=m
-CONFIG_AGP_SIS=m
-CONFIG_AGP_VIA=m
-CONFIG_AGP_I460=m
-CONFIG_AGP_HP_ZX1=m
-CONFIG_AGP_SGI_TIOCA=m
+#. Workaround
+CONFIG_AGP=y
+#. Workaround
+CONFIG_AGP_I460=y
+#. Workaround
+CONFIG_AGP_HP_ZX1=y
+#. Workaround
+CONFIG_AGP_SGI_TIOCA=y
 
 ##
 ## file: drivers/char/ipmi/Kconfig

Modified: dists/sid/linux-2.6/debian/config/kernelarch-x86/config
==============================================================================
--- dists/sid/linux-2.6/debian/config/kernelarch-x86/config	Tue Mar 16 18:52:55 2010	(r15400)
+++ dists/sid/linux-2.6/debian/config/kernelarch-x86/config	Tue Mar 16 19:14:45 2010	(r15401)
@@ -283,11 +283,16 @@
 ##
 ## file: drivers/char/agp/Kconfig
 ##
-CONFIG_AGP=m
-CONFIG_AGP_AMD64=m
-CONFIG_AGP_INTEL=m
-CONFIG_AGP_SIS=m
-CONFIG_AGP_VIA=m
+#. Workaround
+CONFIG_AGP=y
+#. Workaround
+CONFIG_AGP_AMD64=y
+#. Workaround
+CONFIG_AGP_INTEL=y
+#. Workaround
+CONFIG_AGP_SIS=y
+#. Workaround
+CONFIG_AGP_VIA=y
 
 ##
 ## file: drivers/char/hw_random/Kconfig

Modified: dists/sid/linux-2.6/debian/config/kernelarch-x86/config-arch-32
==============================================================================
--- dists/sid/linux-2.6/debian/config/kernelarch-x86/config-arch-32	Tue Mar 16 18:52:55 2010	(r15400)
+++ dists/sid/linux-2.6/debian/config/kernelarch-x86/config-arch-32	Tue Mar 16 19:14:45 2010	(r15401)
@@ -125,12 +125,18 @@
 ##
 ## file: drivers/char/agp/Kconfig
 ##
-CONFIG_AGP_ALI=m
-CONFIG_AGP_ATI=m
-CONFIG_AGP_AMD=m
-CONFIG_AGP_NVIDIA=m
-CONFIG_AGP_SWORKS=m
-CONFIG_AGP_EFFICEON=m
+#. Workaround
+CONFIG_AGP_ALI=y
+#. Workaround
+CONFIG_AGP_ATI=y
+#. Workaround
+CONFIG_AGP_AMD=y
+#. Workaround
+CONFIG_AGP_NVIDIA=y
+#. Workaround
+CONFIG_AGP_SWORKS=y
+#. Workaround
+CONFIG_AGP_EFFICEON=y
 
 ##
 ## file: drivers/crypto/Kconfig

Modified: dists/sid/linux-2.6/debian/config/powerpc/config
==============================================================================
--- dists/sid/linux-2.6/debian/config/powerpc/config	Tue Mar 16 18:52:55 2010	(r15400)
+++ dists/sid/linux-2.6/debian/config/powerpc/config	Tue Mar 16 19:14:45 2010	(r15401)
@@ -152,10 +152,10 @@
 ##
 ## file: drivers/char/agp/Kconfig
 ##
-CONFIG_AGP=m
-CONFIG_AGP_SIS=m
-CONFIG_AGP_VIA=m
-CONFIG_AGP_UNINORTH=m
+#. Workaround
+CONFIG_AGP=y
+#. Workaround
+CONFIG_AGP_UNINORTH=y
 
 ##
 ## file: drivers/char/ipmi/Kconfig