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

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

diff -u --recursive --new-file v2.3.13/linux/drivers/video/matroxfb.c linux/drivers/video/matroxfb.c
@@ -5152,9 +5152,10 @@
 static unsigned int fh = 0;		/* "matrox:fh:xxxxxk" */
 static unsigned int maxclk = 0;		/* "matrox:maxclk:xxxxM" */
 static char fontname[64];		/* "matrox:font:xxxxx" */
+static char videomode[64];		/* "matrox:mode:xxxxx" or "matrox:xxxxx" */
 
 #ifndef MODULE
-void __init matroxfb_setup(char *options, int *ints){
+int __init matroxfb_setup(char *options) {
 	char *this_opt;
 	
 	DBG("matroxfb_setup")
@@ -6088,7 +6089,7 @@
 #ifndef MODULE
 static int __init initialized = 0;
 
-void __init matroxfb_init(void)
+int __init matroxfb_init(void)
 {
 	DBG("matroxfb_init")