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

[Ben Hutchings]

Author: benh
Date: Tue May 31 00:02:40 2011
New Revision: 17542

Log:
[x86] staging, drm: Enable DRM_PSB as module

Disable STUB_POULSBO in favour of this.

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

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Mon May 30 23:56:18 2011	(r17541)
+++ dists/trunk/linux-2.6/debian/changelog	Tue May 31 00:02:40 2011	(r17542)
@@ -41,7 +41,6 @@
   * [x86] media/rc: Enable IR_ITE_CIR, IR_FINTEK as modules
   * gspca: Enable USB_GSPCA_KINECT as module
   * [i386] radio: Enable RADIO_MIROPCM20 as module
-  * [x86] gpu: Enable STUB_POULSBO as module
   * s3fb: Enable FB_S3_DDC
   * viafb: Enable FB_VIA_X_COMPATIBILITY
   * es1968: Enable SND_ES1968_RADIO
@@ -55,6 +54,7 @@
   * memstick: Enable MEMSTICK_R592 as module
   * [x86] edac: Enable EDAC_I7300 as module
   * [i386] staging, video: Enable FB_OLPC_DCON as module
+  * [x86] staging, drm: Enable DRM_PSB as module
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sat, 21 May 2011 22:13:08 +0100
 

Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Mon May 30 23:56:18 2011	(r17541)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Tue May 31 00:02:40 2011	(r17542)
@@ -412,7 +412,7 @@
 ##
 ## file: drivers/gpu/stub/Kconfig
 ##
-CONFIG_STUB_POULSBO=m
+# CONFIG_STUB_POULSBO is not set
 
 ##
 ## file: drivers/gpu/vga/Kconfig
@@ -1097,6 +1097,11 @@
 CONFIG_SX=m
 
 ##
+## file: drivers/staging/gma500/Kconfig
+##
+CONFIG_DRM_PSB=m
+
+##
 ## file: drivers/staging/lirc/Kconfig
 ##
 CONFIG_LIRC_STAGING=y