From beb83c093c29c043fd3dfa6ae5019c1929683b7a Mon Sep 17 00:00:00 2001
From: Ben Hutchings <benh@debian.org>
Date: Thu, 30 Aug 2012 17:29:09 +0000
Subject: [PATCH] drm: Enable various drivers (Closes: #685479)

svn path=/dists/trunk/linux/; revision=19358
---
 debian/changelog                    |  3 +++
 debian/config/config                |  5 +++++
 debian/config/kernelarch-x86/config | 12 +++++++-----
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 961d60680..90545bf47 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ linux (3.5.3-1~experimental.1) UNRELEASED; urgency=low
   [ Ben Hutchings ]
   * mfd: lpc_ich: Fix a 3.5 kernel regression for iTCO_wdt driver
     (Closes: #686040)
+  * drm: Enable various drivers (Closes: #685479):
+    - [x86] Enable DRM_GMA500 (previously DRM_PSB) as module
+    - Enable DRM_CIRRUS_QEMU as module
 
  -- Ben Hutchings <ben@decadent.org.uk>  Mon, 27 Aug 2012 17:22:33 -0700
 
diff --git a/debian/config/config b/debian/config/config
index 81680a60c..f1c17825a 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -356,6 +356,11 @@ CONFIG_FIREWIRE_NOSY=m
 CONFIG_DRM_VIA=m
 CONFIG_DRM_SAVAGE=m
 
+##
+## file: drivers/gpu/drm/cirrus/Kconfig
+##
+CONFIG_DRM_CIRRUS_QEMU=m
+
 ##
 ## file: drivers/gpu/drm/nouveau/Kconfig
 ##
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index c410aa303..3dc13bd7e 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -414,6 +414,13 @@ CONFIG_DRM_I915_KMS=y
 CONFIG_DRM_MGA=m
 CONFIG_DRM_SIS=m
 
+##
+## file: drivers/gpu/drm/gma500/Kconfig
+##
+CONFIG_DRM_GMA500=m
+CONFIG_DRM_GMA600=y
+CONFIG_DRM_GMA3600=y
+
 ##
 ## file: drivers/gpu/drm/nouveau/Kconfig
 ##
@@ -1268,11 +1275,6 @@ CONFIG_COMEDI_FC=m
 ##
 CONFIG_ET131X=m
 
-##
-## file: drivers/staging/gma500/Kconfig
-##
-CONFIG_DRM_PSB=m
-
 ##
 ## file: drivers/staging/hv/Kconfig
 ##