PATCH:Re: Matrox FB problem in 2.3.13

Adam Heath (doogie@debian.org)
Thu, 12 Aug 1999 00:42:38 -0500 (CDT)


On Tue, 10 Aug 1999, David Odin wrote:

>
> Hi,
>
> It seams that some changes in the matroxfb.c file prevent the kernel to
> compile with the support for the matrox frame buffer.
>
> make[3]: Entering directory `/usr/src/linux-2.3.13/drivers/video'
> gcc -D__KERNEL__ -I/usr/src/linux-2.3.13/include -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -pipe -fno-strength-reduce -DCPU=586 -c -o matroxfb.o matroxfb.c
> matroxfb.c: In function `matroxfb_setup':
> matroxfb.c:5165: warning: `return' with a value, in function returning void
> matroxfb.c:5219: `videomode' undeclared (first use this function)
> matroxfb.c:5219: (Each undeclared identifier is reported only once
> matroxfb.c:5219: for each function it appears in.)
> matroxfb.c:5295: warning: `return' with a value, in function returning void
> matroxfb.c: In function `matroxfb_init':
> matroxfb.c:6099: warning: `return' with a value, in function returning void
> matroxfb.c:6100: warning: `return' with a value, in function returning void
> make[3]: *** [matroxfb.o] Error 1
> make[3]: Leaving directory `/usr/src/linux-2.3.13/drivers/video'
> make[2]: *** [first_rule] Error 2
> make[2]: Leaving directory `/usr/src/linux-2.3.13/drivers/video'
> make[1]: *** [_subdir_video] Error 2
> make[1]: Leaving directory `/usr/src/linux-2.3.13/drivers'
> make: *** [_dir_drivers] Error 2

I do not know if it is right. It compiles at least. I am just getting ready
to boot into it.

Adam

======
--- drivers/video/matroxfb.c.bak Wed Aug 11 23:34:16 1999
+++ drivers/video/matroxfb.c Wed Aug 11 23:45:53 1999
@@ -5152,6 +5152,7 @@
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" */

#ifndef MODULE
void __init matroxfb_setup(char *options, int *ints){
@@ -5162,7 +5163,7 @@
fontname[0] = '\0';

if (!options || !*options)
- return 0;
+ return;

for(this_opt=strtok(options,","); this_opt; this_opt=strtok(NULL,",")) {
if (!*this_opt) continue;
@@ -5292,7 +5293,6 @@
}
}
}
- return 0;
}
#endif

@@ -6088,7 +6088,7 @@
#ifndef MODULE
static int __init initialized = 0;

-void __init matroxfb_init(void)
+int __init matroxfb_init(void)
{
DBG("matroxfb_init")

==========

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu
Please read the FAQ at http://www.tux.org/lkml/