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

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

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

Modified Files:
	fbmem.c 
Log Message:
DECstation fb fixes.

Index: fbmem.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/video/fbmem.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- fbmem.c	2001/10/22 22:32:06	1.10
+++ fbmem.c	2001/10/31 18:52:30	1.11
@@ -119,9 +119,7 @@
 extern int stifb_init(void);
 extern int stifb_setup(char*);
 extern int pmagbafb_init(void);
-extern int pmagbafb_setup(char *);
 extern int pmagbbfb_init(void);
-extern int pmagbbfb_setup(char *options, int *ints);
 extern void maxinefb_init(void);
 extern int tx3912fb_init(void);
 extern int radeonfb_init(void);
@@ -301,6 +299,16 @@
 #ifdef CONFIG_FB_MQ200
 	{ "mq200fb", mq200fb_init, mq200fb_setup },
 #endif
+#ifdef CONFIG_FB_PMAG_BA
+	{ "pmagbafb", pmagbafb_init, NULL },
+#endif
+#ifdef CONFIG_FB_PMAGB_B
+	{ "pmagbbfb", pmagbbfb_init, NULL },
+#endif
+#ifdef CONFIG_FB_MAXINE
+	{ "maxinefb", maxinefb_init, NULL },
+#endif
+
 
 	/*
 	 * Generic drivers that don't use resource management (yet)
@@ -317,30 +325,6 @@
 	/* Not a real frame buffer device... */
 	{ "resolver", NULL, resolver_video_setup },
 #endif
-
-#ifdef CONFIG_FB_PMAG_BA
-	{ "pmagbafb", pmagbafb_init, NULL },
-#endif
-#ifdef CONFIG_FB_PMAGB_B
-	{ "pmagbbfb", pmagbbfb_init, NULL },
-#endif
-
-#ifdef CONFIG_FB_MAXINE
-	{ "maxinefb", maxinefb_init, NULL },
-#endif
-
-
-#ifdef CONFIG_FB_PMAG_BA
-       { "pmagbafb", pmagbafb_init, pmagbafb_setup },
-#endif
-#ifdef CONFIG_FB_PMAGB_B
-        { "pmagbbfb", pmagbbfb_init, pmagbbfb_setup },
-#endif
-
-#ifdef CONFIG_FB_MAXINE
-        { "maxinefb", maxinefb_init, maxinefb_setup },
-#endif
-
 
 #ifdef CONFIG_FB_VIRTUAL
 	/*