patch-2.3.14 linux/drivers/video/S3triofb.c

• Lines: 38
• Date: Thu Aug 12 10:22:33 1999
• Orig file: v2.3.13/linux/drivers/video/S3triofb.c
• Orig date: Mon Aug 9 14:59:23 1999

diff -u --recursive --new-file v2.3.13/linux/drivers/video/S3triofb.c linux/drivers/video/S3triofb.c
@@ -99,7 +99,7 @@
      *  Interface to the low level console driver
      */
 
-void s3triofb_init(void);
+int s3triofb_init(void);
 static int s3triofbcon_switch(int con, struct fb_info *info);
 static int s3triofbcon_updatevar(int con, struct fb_info *info);
 static void s3triofbcon_blank(int blank, struct fb_info *info);
@@ -288,7 +288,7 @@
     return -EINVAL;
 }
 
-void __init s3triofb_init(void)
+int __init s3triofb_init(void)
 {
 #ifdef __powerpc__
     /* We don't want to be called like this. */
@@ -296,6 +296,7 @@
 #else /* !__powerpc__ */
     /* To be merged with cybervision */
 #endif /* !__powerpc__ */
+	return 0;
 }
 
 void __init s3trio_resetaccel(void){
@@ -721,9 +722,9 @@
 		    s3trio_setcolreg, &fb_info);
 }
 
-void s3triofb_setup(char *options, int *ints) {
+int s3triofb_setup(char *options) {
 
-        return;
+        return 0;
 
 }