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

[Ben Hutchings]

Author: benh
Date: Mon May 30 23:56:18 2011
New Revision: 17541

Log:
[i386] staging, video: Enable FB_OLPC_DCON as module

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

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Mon May 30 23:51:42 2011	(r17540)
+++ dists/trunk/linux-2.6/debian/changelog	Mon May 30 23:56:18 2011	(r17541)
@@ -54,6 +54,7 @@
   * mmc: Enable MMC_VUB300, MMC_USHC as modules
   * memstick: Enable MEMSTICK_R592 as module
   * [x86] edac: Enable EDAC_I7300 as module
+  * [i386] staging, video: Enable FB_OLPC_DCON 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-arch-32
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-32	Mon May 30 23:51:42 2011	(r17540)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-32	Mon May 30 23:56:18 2011	(r17541)
@@ -351,6 +351,13 @@
 CONFIG_CS5535_GPIO=m
 
 ##
+## file: drivers/staging/olpc_dcon/Kconfig
+##
+CONFIG_FB_OLPC_DCON=m
+CONFIG_FB_OLPC_DCON_1=y
+CONFIG_FB_OLPC_DCON_1_5=y
+
+##
 ## file: drivers/staging/tty/Kconfig
 ##
 # CONFIG_RISCOM8 is not set