[kernel] r19946 - in dists/sid/linux/debian: . config/kernelarch-x86

[Ben Hutchings]

Author: benh
Date: Mon Mar 25 13:37:43 2013
New Revision: 19946

Log:
[x86] drm: Enable DRM_GMA500 as module, replacing DRM_PSB (Closes: #703506)

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

Modified: dists/sid/linux/debian/changelog
==============================================================================
--- dists/sid/linux/debian/changelog	Mon Mar 25 13:13:14 2013	(r19945)
+++ dists/sid/linux/debian/changelog	Mon Mar 25 13:37:43 2013	(r19946)
@@ -5,6 +5,8 @@
   * linux-headers: Fix file installation on architectures without
     Kbuild.platforms (Closes: #703800)
   * [x86] drm/i915: bounds check execbuffer relocation count (CVE-2013-0913)
+  * [x86] drm: Enable DRM_GMA500 as module, replacing DRM_PSB (Closes: #703506)
+    - Enable DRM_GMA600, DRM_GMA3600, DRM_MEDFIELD
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sat, 23 Mar 2013 17:45:03 +0000
 

Modified: dists/sid/linux/debian/config/kernelarch-x86/config
==============================================================================
--- dists/sid/linux/debian/config/kernelarch-x86/config	Mon Mar 25 13:13:14 2013	(r19945)
+++ dists/sid/linux/debian/config/kernelarch-x86/config	Mon Mar 25 13:37:43 2013	(r19946)
@@ -418,6 +418,14 @@
 CONFIG_DRM_SIS=m
 
 ##
+## file: drivers/staging/gma500/Kconfig
+##
+CONFIG_DRM_GMA500=m
+CONFIG_DRM_GMA600=y
+CONFIG_DRM_GMA3600=y
+CONFIG_DRM_MEDFIELD=y
+
+##
 ## file: drivers/gpu/drm/nouveau/Kconfig
 ##
 CONFIG_DRM_NOUVEAU=m
@@ -1270,11 +1278,6 @@
 CONFIG_ET131X=m
 
 ##
-## file: drivers/staging/gma500/Kconfig
-##
-CONFIG_DRM_PSB=m
-
-##
 ## file: drivers/staging/hv/Kconfig
 ##
 CONFIG_HYPERV_STORAGE=m