SOURCES: kernel-desktop-common.config, kernel-desktop-i386.config, ...

[sparky]

Author: sparky                       Date: Thu Jun 22 00:27:48 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- disable vga16 fb on ppc

---- Files affected:
SOURCES:
   kernel-desktop-common.config (1.7 -> 1.8) , kernel-desktop-i386.config (1.4 -> 1.5) , kernel-desktop-i386-smp.config (1.4 -> 1.5) , kernel-desktop-ppc.config (1.4 -> 1.5) , kernel-desktop-ppc-smp.config (1.4 -> 1.5) , kernel-desktop-x86_64.config (1.5 -> 1.6) , kernel-desktop-x86_64-smp.config (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: SOURCES/kernel-desktop-common.config
diff -u SOURCES/kernel-desktop-common.config:1.7 SOURCES/kernel-desktop-common.config:1.8
--- SOURCES/kernel-desktop-common.config:1.7	Wed Jun 21 15:47:17 2006
+++ SOURCES/kernel-desktop-common.config	Thu Jun 22 02:27:43 2006
@@ -2301,7 +2301,7 @@
 # CONFIG_FB_CT65550 is not set
 # CONFIG_FB_ASILIANT is not set
 # CONFIG_FB_IMSTT is not set
-CONFIG_FB_VGA16=m
+# CONFIG_FB_VGA16 configured per-arch
 CONFIG_FB_VESA=y
 
 #
@@ -2361,7 +2361,7 @@
 CONFIG_VGA_CONSOLE=y
 CONFIG_VGACON_SOFT_SCROLLBACK=y
 CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64
-CONFIG_MDA_CONSOLE=m
+# CONFIG_MDA_CONSOLE configured per-arch
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y

================================================================
Index: SOURCES/kernel-desktop-i386.config
diff -u SOURCES/kernel-desktop-i386.config:1.4 SOURCES/kernel-desktop-i386.config:1.5
--- SOURCES/kernel-desktop-i386.config:1.4	Tue Jun 13 15:01:20 2006
+++ SOURCES/kernel-desktop-i386.config	Thu Jun 22 02:27:43 2006
@@ -281,3 +281,5 @@
 CONFIG_IDE=m
 CONFIG_BLK_DEV_IDE=m
 CONFIG_AGP=m
+CONFIG_FB_VGA16=m
+CONFIG_MDA_CONSOLE=m

================================================================
Index: SOURCES/kernel-desktop-i386-smp.config
diff -u SOURCES/kernel-desktop-i386-smp.config:1.4 SOURCES/kernel-desktop-i386-smp.config:1.5
--- SOURCES/kernel-desktop-i386-smp.config:1.4	Tue Jun 13 15:01:20 2006
+++ SOURCES/kernel-desktop-i386-smp.config	Thu Jun 22 02:27:43 2006
@@ -282,3 +282,5 @@
 CONFIG_IDE=m
 CONFIG_BLK_DEV_IDE=m
 CONFIG_AGP=m
+CONFIG_FB_VGA16=m
+CONFIG_MDA_CONSOLE=m

================================================================
Index: SOURCES/kernel-desktop-ppc.config
diff -u SOURCES/kernel-desktop-ppc.config:1.4 SOURCES/kernel-desktop-ppc.config:1.5
--- SOURCES/kernel-desktop-ppc.config:1.4	Tue Jun 13 15:01:20 2006
+++ SOURCES/kernel-desktop-ppc.config	Thu Jun 22 02:27:43 2006
@@ -159,3 +159,5 @@
 CONFIG_IDE=y
 CONFIG_BLK_DEV_IDE=y
 CONFIG_AGP=m
+# CONFIG_FB_VGA16 is not set
+# CONFIG_MDA_CONSOLE is not set

================================================================
Index: SOURCES/kernel-desktop-ppc-smp.config
diff -u SOURCES/kernel-desktop-ppc-smp.config:1.4 SOURCES/kernel-desktop-ppc-smp.config:1.5
--- SOURCES/kernel-desktop-ppc-smp.config:1.4	Tue Jun 13 15:01:20 2006
+++ SOURCES/kernel-desktop-ppc-smp.config	Thu Jun 22 02:27:43 2006
@@ -158,3 +158,5 @@
 CONFIG_IDE=y
 CONFIG_BLK_DEV_IDE=y
 CONFIG_AGP=m
+# CONFIG_FB_VGA16 is not set
+# CONFIG_MDA_CONSOLE is not set

================================================================
Index: SOURCES/kernel-desktop-x86_64.config
diff -u SOURCES/kernel-desktop-x86_64.config:1.5 SOURCES/kernel-desktop-x86_64.config:1.6
--- SOURCES/kernel-desktop-x86_64.config:1.5	Tue Jun 13 15:01:20 2006
+++ SOURCES/kernel-desktop-x86_64.config	Thu Jun 22 02:27:43 2006
@@ -180,3 +180,5 @@
 CONFIG_IDE=m
 CONFIG_BLK_DEV_IDE=m
 CONFIG_AGP=y
+CONFIG_FB_VGA16=m
+CONFIG_MDA_CONSOLE=m

================================================================
Index: SOURCES/kernel-desktop-x86_64-smp.config
diff -u SOURCES/kernel-desktop-x86_64-smp.config:1.5 SOURCES/kernel-desktop-x86_64-smp.config:1.6
--- SOURCES/kernel-desktop-x86_64-smp.config:1.5	Tue Jun 13 15:01:20 2006
+++ SOURCES/kernel-desktop-x86_64-smp.config	Thu Jun 22 02:27:43 2006
@@ -193,3 +193,5 @@
 CONFIG_IDE=m
 CONFIG_BLK_DEV_IDE=m
 CONFIG_AGP=y
+CONFIG_FB_VGA16=m
+CONFIG_MDA_CONSOLE=m
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/kernel-desktop-common.config?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/SOURCES/kernel-desktop-i386.config?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/SOURCES/kernel-desktop-i386-smp.config?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/SOURCES/kernel-desktop-ppc.config?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/SOURCES/kernel-desktop-ppc-smp.config?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/SOURCES/kernel-desktop-x86_64.config?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/SOURCES/kernel-desktop-x86_64-smp.config?r1=1.5&r2=1.6&f=u