Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[linux-2.6-omap-h63xx.git] / drivers / video / s3fb.c

diff --git a/drivers/video/s3fb.c b/drivers/video/s3fb.c
index 3162c37b1447f32223b7c79005263e1f325aa3f8..98919a6975f04b10ccec1219335dd60a2970d61e 100644 (file)
--- a/drivers/video/s3fb.c
+++ b/drivers/video/s3fb.c
@@ -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;
        }