diff options
| author | Antonino A. Daplas <adaplas@gmail.com> | 2007-08-10 13:00:46 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-11 15:47:40 -0700 |
| commit | 4769a9a53b39f3b6a7e4d0b3c5e6b9598560818d (patch) | |
| tree | 872f7306ec85ba3f09e14d039a6817080f8ffa91 /drivers/video/console | |
| parent | 04a3f959f691fd3eea42be37bc7a8cf32c1bd899 (diff) | |
| download | kernel_samsung_smdk4412-4769a9a53b39f3b6a7e4d0b3c5e6b9598560818d.zip kernel_samsung_smdk4412-4769a9a53b39f3b6a7e4d0b3c5e6b9598560818d.tar.gz kernel_samsung_smdk4412-4769a9a53b39f3b6a7e4d0b3c5e6b9598560818d.tar.bz2 | |
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>
Diffstat (limited to 'drivers/video/console')
| -rw-r--r-- | drivers/video/console/fbcon.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c index decfdc8..e58c87b 100644 --- a/drivers/video/console/fbcon.c +++ b/drivers/video/console/fbcon.c @@ -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; |