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

Commit 4769a9a5 authored by Antonino A. Daplas's avatar Antonino A. Daplas Committed by Linus Torvalds
Browse files

fbcon: Kill compile warning 



Fix compile warning ('map_override unused') if fbcon is compiled as a module
and CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=n.

[akpm@linux-foundation.org: cleanup]
Signed-off-by: default avatarAntonino Daplas <adaplas@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 04a3f959

drivers/video/console/fbcon.c

+13 −1
Original line number Original line Diff line number Diff line
@@ -127,8 +127,20 @@ static int last_fb_vc = MAX_NR_CONSOLES - 1; 
static int fbcon_is_default = 1; 

static int fbcon_is_default = 1; 

static int fbcon_has_exited;

static int fbcon_has_exited;

static int primary_device = -1;

static int primary_device = -1;



#ifdef CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY

static int map_override;

static int map_override;





static inline void fbcon_map_override(void)

{

	map_override = 1;

}

#else

static inline void fbcon_map_override(void)

{

}

#endif /* CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY */



/* font data */

/* font data */

static char fontname[40];

static char fontname[40];
@@ -506,7 +518,7 @@ static int __init fb_console_setup(char *this_opt) 
						(options[j++]-'0') % FB_MAX;

						(options[j++]-'0') % FB_MAX;

				}

				}





				map_override = 1;

				fbcon_map_override();

			}

			}





			return 1;

			return 1;