[Linuxconsole-commit]CVS: ruby/linux/drivers/video Config.in,1.57,1.58 fbmem.c,1.58,1.59

[James S. <jsi...@us...>]

Update of /cvsroot/linuxconsole/ruby/linux/drivers/video
In directory usw-pr-cvs1:/tmp/cvs-serv5099/linux/drivers/video

Modified Files:
	Config.in fbmem.c 
Log Message:
Synced to 2.5.4

Index: Config.in
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/Config.in,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- Config.in	8 Jan 2002 08:20:48 -0000	1.57
+++ Config.in	14 Mar 2002 20:02:07 -0000	1.58
@@ -146,14 +146,14 @@
       if [ "$CONFIG_FB_MATROX" != "n" ]; then
          bool '    Millennium I/II support' CONFIG_FB_MATROX_MILLENIUM
          bool '    Mystique support' CONFIG_FB_MATROX_MYSTIQUE
-         bool '    G100/G200/G400/G450 support' CONFIG_FB_MATROX_G100
+         bool '    G100/G200/G400/G450/G550 support' CONFIG_FB_MATROX_G100
          if [ "$CONFIG_I2C" != "n" ]; then
             dep_tristate '      Matrox I2C support' CONFIG_FB_MATROX_I2C $CONFIG_FB_MATROX $CONFIG_I2C_ALGOBIT
             if [ "$CONFIG_FB_MATROX_G100" = "y" ]; then
                dep_tristate '      G400 second head support' CONFIG_FB_MATROX_MAVEN $CONFIG_FB_MATROX_I2C
             fi
          fi
-         dep_tristate '     G450 second head support' CONFIG_FB_MATROX_G450 $CONFIG_FB_MATROX_G100
+         dep_tristate '     G450/G550 second head support' CONFIG_FB_MATROX_G450 $CONFIG_FB_MATROX_G100
          bool '    Multihead support' CONFIG_FB_MATROX_MULTIHEAD
       fi
       tristate '  ATI Mach64 display support (EXPERIMENTAL)' CONFIG_FB_ATY

Index: fbmem.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/fbmem.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- fbmem.c	13 Mar 2002 23:48:37 -0000	1.58
+++ fbmem.c	14 Mar 2002 20:02:07 -0000	1.59
@@ -235,7 +235,7 @@
 #ifdef CONFIG_FB_SIS
 	{ "sisfb", sisfb_init, sisfb_setup },
 #endif
-	
+
 	/*
 	 * Generic drivers that are used as fallbacks
 	 * 
@@ -311,9 +311,6 @@
 #endif
 #ifdef CONFIG_FB_PVR2
        	{ "pvr2", pvr2fb_init, pvr2fb_setup },
-#endif
-#ifdef CONFIG_FB_VOODOO1
-	{ "sstfb", sstfb_init, sstfb_setup },
 #endif
 #ifdef CONFIG_FB_SED1345
 	{ "sed1345fb", sed1345fb_init, NULL },