From fbb493cdc3599efde7f0486eff678a5e80ef2be3 Mon Sep 17 00:00:00 2001
From: Bastian Blank <waldi@debian.org>
Date: Tue, 16 Mar 2010 19:14:45 +0000
Subject: [PATCH] * debian/changelog: Update. * debian/config: Make all AGP
 driver built-in to workaround race-condition   between DRM and AGP.

svn path=/dists/sid/linux-2.6/; revision=15401
---
 debian/changelog                            |  2 ++
 debian/config/alpha/config                  |  8 ++++----
 debian/config/ia64/config                   | 14 ++++++++------
 debian/config/kernelarch-x86/config         | 15 ++++++++++-----
 debian/config/kernelarch-x86/config-arch-32 | 18 ++++++++++++------
 debian/config/powerpc/config                |  8 ++++----
 6 files changed, 40 insertions(+), 25 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 016dd16d1..f86008c79 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,8 @@ linux-2.6 (2.6.32-10) UNRELEASED; urgency=low
      #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:
diff --git a/debian/config/alpha/config b/debian/config/alpha/config
index e86045535..e37b93618 100644
--- a/debian/config/alpha/config
+++ b/debian/config/alpha/config
@@ -167,10 +167,10 @@ CONFIG_MAX_RAW_DEVS=256
 ##
 ## 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
diff --git a/debian/config/ia64/config b/debian/config/ia64/config
index 7850896f5..45c2cadca 100644
--- a/debian/config/ia64/config
+++ b/debian/config/ia64/config
@@ -102,12 +102,14 @@ CONFIG_MMTIMER=m
 ##
 ## 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
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index 43d341c9e..dc19827c7 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -283,11 +283,16 @@ CONFIG_HPET_MMAP=y
 ##
 ## 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
diff --git a/debian/config/kernelarch-x86/config-arch-32 b/debian/config/kernelarch-x86/config-arch-32
index eaa129512..529ce0a53 100644
--- a/debian/config/kernelarch-x86/config-arch-32
+++ b/debian/config/kernelarch-x86/config-arch-32
@@ -125,12 +125,18 @@ CONFIG_CS5535_GPIO=m
 ##
 ## 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
diff --git a/debian/config/powerpc/config b/debian/config/powerpc/config
index 2b58b2d61..59afedfcb 100644
--- a/debian/config/powerpc/config
+++ b/debian/config/powerpc/config
@@ -152,10 +152,10 @@ CONFIG_APPLICOM=m
 ##
 ## 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