Commit 62fa4dc7 authored Feb 22, 2007 by Ondrej Zajicek Committed by Linus Torvalds Feb 26, 2007

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



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>

parent 25165120

drivers/video/s3fb.c

+3 −3

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

Admin message