提交 9a054fba 编写于 作者: G Geert Uytterhoeven 提交者: Linus Torvalds

fb: move and rename extern declaration for global_mode_option

Move the extern declaration for global_mode_option to <linux/fb.h> and rename
the variable to fb_mode_option.
Signed-off-by: NGeert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
上级 61e0b28e
...@@ -1567,8 +1567,6 @@ int fb_new_modelist(struct fb_info *info) ...@@ -1567,8 +1567,6 @@ int fb_new_modelist(struct fb_info *info)
static char *video_options[FB_MAX] __read_mostly; static char *video_options[FB_MAX] __read_mostly;
static int ofonly __read_mostly; static int ofonly __read_mostly;
extern const char *global_mode_option;
/** /**
* fb_get_options - get kernel boot parameters * fb_get_options - get kernel boot parameters
* @name: framebuffer name as it would appear in * @name: framebuffer name as it would appear in
...@@ -1636,7 +1634,7 @@ static int __init video_setup(char *options) ...@@ -1636,7 +1634,7 @@ static int __init video_setup(char *options)
} }
if (!global && !strstr(options, "fb:")) { if (!global && !strstr(options, "fb:")) {
global_mode_option = options; fb_mode_option = options;
global = 1; global = 1;
} }
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#define DPRINTK(fmt, args...) #define DPRINTK(fmt, args...)
#endif #endif
const char *global_mode_option; const char *fb_mode_option;
/* /*
* Standard video mode definitions (taken from XFree86) * Standard video mode definitions (taken from XFree86)
...@@ -510,7 +510,7 @@ int fb_find_mode(struct fb_var_screeninfo *var, ...@@ -510,7 +510,7 @@ int fb_find_mode(struct fb_var_screeninfo *var,
default_bpp = 8; default_bpp = 8;
/* Did the user specify a video mode? */ /* Did the user specify a video mode? */
if (mode_option || (mode_option = global_mode_option)) { if (mode_option || (mode_option = fb_mode_option)) {
const char *name = mode_option; const char *name = mode_option;
unsigned int namelen = strlen(name); unsigned int namelen = strlen(name);
int res_specified = 0, bpp_specified = 0, refresh_specified = 0; int res_specified = 0, bpp_specified = 0, refresh_specified = 0;
......
...@@ -1056,6 +1056,7 @@ struct fb_videomode { ...@@ -1056,6 +1056,7 @@ struct fb_videomode {
u32 flag; u32 flag;
}; };
extern const char *fb_mode_option;
extern const struct fb_videomode vesa_modes[]; extern const struct fb_videomode vesa_modes[];
struct fb_modelist { struct fb_modelist {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册