[kernel] r17954 - in dists/trunk/linux-2.6/debian: . config config/armel

[Ben Hutchings]

Author: benh
Date: Fri Aug 19 00:43:09 2011
New Revision: 17954

Log:
video: Enable FB_UDL as module (Closes: #618261)

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/armel/config.kirkwood
   dists/trunk/linux-2.6/debian/config/config

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Fri Aug 19 00:38:17 2011	(r17953)
+++ dists/trunk/linux-2.6/debian/changelog	Fri Aug 19 00:43:09 2011	(r17954)
@@ -10,6 +10,7 @@
     Enable ACPI_APEI_MEMORY_FAILURE.
   * netfilter: Enable IP_SET_HASH_NETIFACE as module
   * net: Enable NFC, NFC_PN533 as modules
+  * video: Enable FB_UDL as module (Closes: #618261)
 
  -- Ben Hutchings <ben at decadent.org.uk>  Wed, 27 Jul 2011 23:58:10 +0200
 

Modified: dists/trunk/linux-2.6/debian/config/armel/config.kirkwood
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config.kirkwood	Fri Aug 19 00:38:17 2011	(r17953)
+++ dists/trunk/linux-2.6/debian/config/armel/config.kirkwood	Fri Aug 19 00:43:09 2011	(r17954)
@@ -536,7 +536,6 @@
 ## file: drivers/video/Kconfig
 ##
 CONFIG_FB=m
-CONFIG_FB_UDL=m
 
 ##
 ## file: drivers/video/console/Kconfig

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Fri Aug 19 00:38:17 2011	(r17953)
+++ dists/trunk/linux-2.6/debian/config/config	Fri Aug 19 00:43:09 2011	(r17954)
@@ -2899,7 +2899,7 @@
 # CONFIG_FB_CARMINE is not set
 # CONFIG_FB_TMIO is not set
 CONFIG_FB_SM501=m
-# CONFIG_FB_UDL is not set
+CONFIG_FB_UDL=m
 CONFIG_FB_METRONOME=m
 CONFIG_FB_MB862XX=m
 ## choice: GDC variant