git.openpandora.org
/
pandora-kernel.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://people.freedesktop.org/~airlied/linux
[pandora-kernel.git]
/
drivers
/
video
/
fbmem.c
diff --git
a/drivers/video/fbmem.c
b/drivers/video/fbmem.c
index
e296967
..
7309ac7
100644
(file)
--- a/
drivers/video/fbmem.c
+++ b/
drivers/video/fbmem.c
@@
-1941,6
+1941,9
@@
int fb_get_options(const char *name, char **option)
options = opt + name_len + 1;
}
}
+ /* No match, pass global option */
+ if (!options && option && fb_mode_option)
+ options = kstrdup(fb_mode_option, GFP_KERNEL);
if (options && !strncmp(options, "off", 3))
retval = 1;