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

[Ben Hutchings]

Author: benh
Date: Thu Aug 30 17:29:09 2012
New Revision: 19358

Log:
drm: Enable various drivers (Closes: #685479)

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

Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog	Thu Aug 30 17:10:49 2012	(r19357)
+++ dists/trunk/linux/debian/changelog	Thu Aug 30 17:29:09 2012	(r19358)
@@ -6,6 +6,9 @@
   [ 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 at decadent.org.uk>  Mon, 27 Aug 2012 17:22:33 -0700
 

Modified: dists/trunk/linux/debian/config/config
==============================================================================
--- dists/trunk/linux/debian/config/config	Thu Aug 30 17:10:49 2012	(r19357)
+++ dists/trunk/linux/debian/config/config	Thu Aug 30 17:29:09 2012	(r19358)
@@ -357,6 +357,11 @@
 CONFIG_DRM_SAVAGE=m
 
 ##
+## file: drivers/gpu/drm/cirrus/Kconfig
+##
+CONFIG_DRM_CIRRUS_QEMU=m
+
+##
 ## file: drivers/gpu/drm/nouveau/Kconfig
 ##
 CONFIG_DRM_NOUVEAU=m

Modified: dists/trunk/linux/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux/debian/config/kernelarch-x86/config	Thu Aug 30 17:10:49 2012	(r19357)
+++ dists/trunk/linux/debian/config/kernelarch-x86/config	Thu Aug 30 17:29:09 2012	(r19358)
@@ -415,6 +415,13 @@
 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
 ##
 CONFIG_DRM_NOUVEAU=m
@@ -1269,11 +1276,6 @@
 CONFIG_ET131X=m
 
 ##
-## file: drivers/staging/gma500/Kconfig
-##
-CONFIG_DRM_PSB=m
-
-##
 ## file: drivers/staging/hv/Kconfig
 ##
 CONFIG_HYPERV_STORAGE=m