projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
[linux-2.6-block.git]
/
drivers
/
video
/
fbmem.c
diff --git
a/drivers/video/fbmem.c
b/drivers/video/fbmem.c
index a1f2e7ce730bd1881a4c2519617bb549761f4f72..99bbd282ce634186e5d28f9a13cd9ba78658ddc2 100644
(file)
--- a/
drivers/video/fbmem.c
+++ b/
drivers/video/fbmem.c
@@
-1800,7
+1800,7
@@
static int __init video_setup(char *options)
global = 1;
}
- if (!global && !str
str(options, "fb:"
)) {
+ if (!global && !str
chr(options, ':'
)) {
fb_mode_option = options;
global = 1;
}