Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fb: move and rename extern declaration for global_mode_option

Browse source 
Move the extern declaration for global_mode_option to <linux/fb.h> and rename
the variable to fb_mode_option.

Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Geert Uytterhoeven 2007-10-16 01:29:51 -07:00 committed by Linus Torvalds
parent 61e0b28e54
commit 9a054fbac8
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/video/fbmem.c
View file

@ -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)
} }
if (!global && !strstr(options, "fb:")) { if (!global && !strstr(options, "fb:")) {
global_mode_option = options; fb_mode_option = options;
global = 1; global = 1;
} }

4
drivers/video/modedb.c
View file

@ -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,
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;

1
include/linux/fb.h
View file

@ -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 {