[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>

authored by Ondrej Zajicek and committed by Linus Torvalds 62fa4dc7 25165120

+3 -3
+3 -3
drivers/video/s3fb.c
··· 1134 if (!*opt) 1135 continue; 1136 #ifdef CONFIG_MTRR 1137 - else if (!strcmp(opt, "mtrr:")) 1138 mtrr = simple_strtoul(opt + 5, NULL, 0); 1139 #endif 1140 - else if (!strcmp(opt, "fasttext:")) 1141 - mtrr = simple_strtoul(opt + 9, NULL, 0); 1142 else 1143 mode = opt; 1144 }
··· 1134 if (!*opt) 1135 continue; 1136 #ifdef CONFIG_MTRR 1137 + else if (!strncmp(opt, "mtrr:", 5)) 1138 mtrr = simple_strtoul(opt + 5, NULL, 0); 1139 #endif 1140 + else if (!strncmp(opt, "fasttext:", 9)) 1141 + fasttext = simple_strtoul(opt + 9, NULL, 0); 1142 else 1143 mode = opt; 1144 }