[Linuxconsole-commit]CVS: ruby/linux/drivers/video fbmem.c,1.52,1.53

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

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

Modified Files:
	fbmem.c 
Log Message:
Synced voodoo 1 support in fbmem.c with 2.4.10.

Index: fbmem.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/fbmem.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- fbmem.c	2001/10/08 19:20:39	1.52
+++ fbmem.c	2001/10/10 16:31:16	1.53
@@ -131,6 +131,7 @@
 extern int radeonfb_init(void);
 extern int radeonfb_setup(char*);
 extern int sstfb_init(void);
+extern int sstfb_setup(char*);
 extern int e1355fb_init(void);
 extern int e1355fb_setup(char*);
 extern int pvr2fb_init(void);
@@ -226,8 +227,8 @@
 #ifdef CONFIG_FB_SIS
 	{ "sisfb", sisfb_init, sisfb_setup },
 #endif
-#ifdef CONFIG_FB_SST
-	{ "sstfb", sstfb_init, NULL },
+#ifdef CONFIG_FB_VOODOO1
+	{ "sstfb", sstfb_init, sstfb_setup },
 #endif
 
 	/*