[Linux-mips-commits]CVS: linux/drivers/video fbmem.c,1.11,1.12

[Paul M. <le...@us...>]

Update of /cvsroot/linux-mips/linux/drivers/video
In directory usw-pr-cvs1:/tmp/cvs-serv17111/drivers/video

Modified Files:
	fbmem.c 
Log Message:
Sync with OSS 2.4.12.



Index: fbmem.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/video/fbmem.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- fbmem.c	2001/10/31 18:52:30	1.11
+++ fbmem.c	2001/11/06 00:43:17	1.12
@@ -134,7 +134,9 @@
 extern int pvr2fb_setup(char*);
 extern int mq200fb_init(void);
 extern int mq200fb_setup(char*);
-  
+extern int sstfb_init(void);
+extern int sstfb_setup(char*);
+
 static struct {
 	const char *name;
 	int (*init)(void);
@@ -213,7 +215,9 @@
 #ifdef CONFIG_FB_SIS
 	{ "sisfb", sisfb_init, sisfb_setup },
 #endif
-
+#ifdef CONFIG_FB_VOODOO1
+	{ "sst", sstfb_init, sstfb_setup },
+#endif
 	/*
 	 * Generic drivers that are used as fallbacks
 	 *