Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a054fba authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Linus Torvalds
Browse files

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: default avatarGeert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 61e0b28e

drivers/video/fbmem.c

+1 −3
Original line number Diff line number Diff line
@@ -1567,8 +1567,6 @@ int fb_new_modelist(struct fb_info *info) 
static char *video_options[FB_MAX] __read_mostly;

static int ofonly __read_mostly;



extern const char *global_mode_option;



/**

 * fb_get_options - get kernel boot parameters

 * @name:   framebuffer name as it would appear in
@@ -1636,7 +1634,7 @@ static int __init video_setup(char *options) 
 	}



 	if (!global && !strstr(options, "fb:")) {

 		global_mode_option = options;

 		fb_mode_option = options;

 		global = 1;

 	}

drivers/video/modedb.c

+2 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#define DPRINTK(fmt, args...)

#endif



const char *global_mode_option;

const char *fb_mode_option;



    /*

     *  Standard video mode definitions (taken from XFree86)
@@ -510,7 +510,7 @@ int fb_find_mode(struct fb_var_screeninfo *var, 
	default_bpp = 8;



    /* 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;

	unsigned int namelen = strlen(name);

	int res_specified = 0, bpp_specified = 0, refresh_specified = 0;

include/linux/fb.h

+1 −0
Original line number Diff line number Diff line
@@ -1056,6 +1056,7 @@ struct fb_videomode { 
	u32 flag;

};



extern const char *fb_mode_option;

extern const struct fb_videomode vesa_modes[];



struct fb_modelist {