mirror of
https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git
synced 2024-11-07 04:09:21 +00:00
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: Antonino Daplas <adaplas@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
04a3f959f6
commit
4769a9a53b
1 changed files with 13 additions and 1 deletions
|
@ -127,8 +127,20 @@ static int last_fb_vc = MAX_NR_CONSOLES - 1;
|
|||
static int fbcon_is_default = 1;
|
||||
static int fbcon_has_exited;
|
||||
static int primary_device = -1;
|
||||
|
||||
#ifdef CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY
|
||||
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 */
|
||||
static char fontname[40];
|
||||
|
||||
|
@ -506,7 +518,7 @@ static int __init fb_console_setup(char *this_opt)
|
|||
(options[j++]-'0') % FB_MAX;
|
||||
}
|
||||
|
||||
map_override = 1;
|
||||
fbcon_map_override();
|
||||
}
|
||||
|
||||
return 1;
|
||||
|
|
Loading…
Reference in a new issue