[kernel] r14522 - in dists/sid/linux-2.6/debian: . config/armel

[Martin Michlmayr]

Author: tbm
Date: Fri Oct 30 12:10:01 2009
New Revision: 14522

Log:
[armel/orion5x, armel/kirkwood] Make sure VGA_CONSOLE is disabled,
otherwise the kernel won't boot.

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

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Fri Oct 30 11:42:35 2009	(r14521)
+++ dists/sid/linux-2.6/debian/changelog	Fri Oct 30 12:10:01 2009	(r14522)
@@ -1,6 +1,8 @@
 linux-2.6 (2.6.31-2) UNRELEASED; urgency=low
 
   [ Martin Michlmayr ]
+  * [armel/orion5x, armel/kirkwood] Make sure VGA_CONSOLE is disabled,
+    otherwise the kernel won't boot.
   * [armel/kirkwood] Enable CRYPTO_DEV_MV_CESA (Closes: #552270).
   * [armel/kirkwood, armel/orion5x] Enable ORION_WATCHDOG (the
     name of the config variable changed).

Modified: dists/sid/linux-2.6/debian/config/armel/config.kirkwood
==============================================================================
--- dists/sid/linux-2.6/debian/config/armel/config.kirkwood	Fri Oct 30 11:42:35 2009	(r14521)
+++ dists/sid/linux-2.6/debian/config/armel/config.kirkwood	Fri Oct 30 12:10:01 2009	(r14522)
@@ -532,6 +532,11 @@
 CONFIG_FB=m
 
 ##
+## file: drivers/video/console/Kconfig
+##
+# CONFIG_VGA_CONSOLE is not set
+
+##
 ## file: drivers/watchdog/Kconfig
 ##
 CONFIG_WATCHDOG=y

Modified: dists/sid/linux-2.6/debian/config/armel/config.orion5x
==============================================================================
--- dists/sid/linux-2.6/debian/config/armel/config.orion5x	Fri Oct 30 11:42:35 2009	(r14521)
+++ dists/sid/linux-2.6/debian/config/armel/config.orion5x	Fri Oct 30 12:10:01 2009	(r14522)
@@ -512,6 +512,11 @@
 CONFIG_FB=m
 
 ##
+## file: drivers/video/console/Kconfig
+##
+# CONFIG_VGA_CONSOLE is not set
+
+##
 ## file: drivers/watchdog/Kconfig
 ##
 CONFIG_WATCHDOG=y