r4726 - in dists/sid/linux-2.6/debian: . arch/amd64 arch/i386

[Simon Horman]

Author: horms
Date: 2005-11-04 04:07:28 +0000 (Fri, 04 Nov 2005)
New Revision: 4726

Modified:
   dists/sid/linux-2.6/debian/arch/amd64/config
   dists/sid/linux-2.6/debian/arch/i386/config
   dists/sid/linux-2.6/debian/changelog
Log:
  * [386, AMD64] Set CONFIG_FRAMEBUFFER_CONSOLE=y instead of m.
    As vesadb now built into the kernel, after finally dropping the
    debian-specific patch to make it modular, make fbcons builtin too, else
    all sorts of weird stuff happens which is hard for the inird builders to
    automatically compenste for. (Closes: #336450)


Modified: dists/sid/linux-2.6/debian/arch/amd64/config
===================================================================
--- dists/sid/linux-2.6/debian/arch/amd64/config	2005-11-03 21:59:03 UTC (rev 4725)
+++ dists/sid/linux-2.6/debian/arch/amd64/config	2005-11-04 04:07:28 UTC (rev 4726)
@@ -1236,7 +1236,7 @@
 CONFIG_FB_VIRTUAL=m
 CONFIG_VGA_CONSOLE=y
 CONFIG_DUMMY_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE=m
+CONFIG_FRAMEBUFFER_CONSOLE=y
 # CONFIG_FONTS is not set
 CONFIG_FONT_8x8=y
 CONFIG_FONT_8x16=y

Modified: dists/sid/linux-2.6/debian/arch/i386/config
===================================================================
--- dists/sid/linux-2.6/debian/arch/i386/config	2005-11-03 21:59:03 UTC (rev 4725)
+++ dists/sid/linux-2.6/debian/arch/i386/config	2005-11-04 04:07:28 UTC (rev 4726)
@@ -1448,7 +1448,7 @@
 CONFIG_VGA_CONSOLE=y
 CONFIG_MDA_CONSOLE=m
 CONFIG_DUMMY_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE=m
+CONFIG_FRAMEBUFFER_CONSOLE=y
 # CONFIG_FONTS is not set
 CONFIG_FONT_8x8=y
 CONFIG_FONT_8x16=y

Modified: dists/sid/linux-2.6/debian/changelog
===================================================================
--- dists/sid/linux-2.6/debian/changelog	2005-11-03 21:59:03 UTC (rev 4725)
+++ dists/sid/linux-2.6/debian/changelog	2005-11-04 04:07:28 UTC (rev 4726)
@@ -15,8 +15,15 @@
   * Fix the install-image script to correctly include all the necessary
     stuff in scripts. (Closes: #336424)
 
- -- maximilian attems <maks at sternwelten.at>  Thu,  3 Nov 2005 12:37:31 +0100
+  [ Simon Horman ]
+  * [386, AMD64] Set CONFIG_FRAMEBUFFER_CONSOLE=y instead of m.
+    As vesadb now built into the kernel, after finally dropping the
+    debian-specific patch to make it modular, make fbcons builtin too, else
+    all sorts of weird stuff happens which is hard for the inird builders to
+    automatically compenste for. (Closes: #336450)
 
+ -- Simon Horman <horms at debian.org>  Fri,  4 Nov 2005 13:03:49 +0900
+
 linux-2.6 (2.6.14-2) unstable; urgency=low
 
   [ Simon Horman ]