redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

[PATCH] Fix build-failure in drivers/video/s3fb.c

Browse source 
Toralf Förster pointed out that drivers/video/s3fb.c would fail to compile:
> ...
>   CC      drivers/video/s3fb.o
> drivers/video/s3fb.c: In function `s3_pci_remove':
> drivers/video/s3fb.c:1003: warning: unused variable `par'
> drivers/video/s3fb.c: In function `s3fb_setup':
> drivers/video/s3fb.c:1141: error: `mtrr' undeclared (first use in this function)
> drivers/video/s3fb.c:1141: error: (Each undeclared identifier is reported only once
> drivers/video/s3fb.c:1141: error: for each function it appears in.)
> make[2]: *** [drivers/video/s3fb.o] Error 1
> make[1]: *** [drivers/video] Error 2
> make: *** [drivers] Error 2

Here is fix, it also fixes broken boot options.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Ondrej Zajicek 2007-02-22 17:00:41 +01:00 committed by Linus Torvalds
parent 25165120f2
commit 62fa4dc7f7
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/video/s3fb.c
View file

@ -1134,11 +1134,11 @@ static int __init s3fb_setup(char *options)
if (!*opt)
continue;
#ifdef CONFIG_MTRR
else if (!strcmp(opt, "mtrr:"))
else if (!strncmp(opt, "mtrr:", 5))
mtrr = simple_strtoul(opt + 5, NULL, 0);
#endif
else if (!strcmp(opt, "fasttext:"))
mtrr = simple_strtoul(opt + 9, NULL, 0);
else if (!strncmp(opt, "fasttext:", 9))
fasttext = simple_strtoul(opt + 9, NULL, 0);
else
mode = opt;
}