[kernel] r15131 - in dists/trunk/linux-2.6/debian: . config/mips

[Aurelien Jarno]

Author: aurel32
Date: Sun Feb  7 17:31:57 2010
New Revision: 15131

Log:
* Enable CONFIG_FB_CIRRUS and CONFIG_LOGO on 4kc-malta and 5kc-malta.

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta
   dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Sun Feb  7 10:27:02 2010	(r15130)
+++ dists/trunk/linux-2.6/debian/changelog	Sun Feb  7 17:31:57 2010	(r15131)
@@ -17,6 +17,9 @@
   * Implement power-off for D-Link DNS-323 rev B1 and fix the blinking
     power LED (Erik Benada) (Closes: #503172).
 
+  [ Aurelien Jarno ]
+  * Enable CONFIG_FB_CIRRUS and CONFIG_LOGO on 4kc-malta and 5kc-malta.
+
  -- Bastian Blank <waldi at debian.org>  Thu, 04 Feb 2010 12:08:47 +0100
 
 linux-2.6 (2.6.32-7) unstable; urgency=low

Modified: dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta	Sun Feb  7 10:27:02 2010	(r15130)
+++ dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta	Sun Feb  7 17:31:57 2010	(r15131)
@@ -1128,7 +1128,7 @@
 CONFIG_FIRMWARE_EDID=y
 CONFIG_FB_MODE_HELPERS=y
 CONFIG_FB_TILEBLITTING=y
-CONFIG_FB_CIRRUS=m
+CONFIG_FB_CIRRUS=y
 CONFIG_FB_PM2=m
 CONFIG_FB_PM2_FIFO_DISCONNECT=y
 CONFIG_FB_CYBER2000=m
@@ -1178,7 +1178,7 @@
 ##
 ## file: drivers/video/logo/Kconfig
 ##
-# CONFIG_LOGO is not set
+CONFIG_LOGO=y
 
 ##
 ## file: drivers/watchdog/Kconfig

Modified: dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta	Sun Feb  7 10:27:02 2010	(r15130)
+++ dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta	Sun Feb  7 17:31:57 2010	(r15131)
@@ -1350,7 +1350,7 @@
 CONFIG_FIRMWARE_EDID=y
 CONFIG_FB_MODE_HELPERS=y
 CONFIG_FB_TILEBLITTING=y
-CONFIG_FB_CIRRUS=m
+CONFIG_FB_CIRRUS=y
 CONFIG_FB_PM2=m
 CONFIG_FB_PM2_FIFO_DISCONNECT=y
 CONFIG_FB_CYBER2000=m
@@ -1414,7 +1414,7 @@
 ##
 ## file: drivers/video/logo/Kconfig
 ##
-# CONFIG_LOGO is not set
+CONFIG_LOGO=y
 
 ##
 ## file: drivers/w1/Kconfig