|
@@ -107,9 +107,7 @@ static struct display fb_display[MAX_NR_CONSOLES];
|
|
|
|
|
|
static signed char con2fb_map[MAX_NR_CONSOLES];
|
|
|
static signed char con2fb_map_boot[MAX_NR_CONSOLES];
|
|
|
-#ifndef MODULE
|
|
|
-static int logo_height;
|
|
|
-#endif
|
|
|
+
|
|
|
static int logo_lines;
|
|
|
/* logo_shown is an index to vc_cons when >= 0; otherwise follows FBCON_LOGO
|
|
|
enums. */
|
|
@@ -607,6 +605,7 @@ static void fbcon_prepare_logo(struct vc_data *vc, struct fb_info *info,
|
|
|
struct fbcon_ops *ops = info->fbcon_par;
|
|
|
int cnt, erase = vc->vc_video_erase_char, step;
|
|
|
unsigned short *save = NULL, *r, *q;
|
|
|
+ int logo_height;
|
|
|
|
|
|
if (info->flags & FBINFO_MODULE) {
|
|
|
logo_shown = FBCON_LOGO_DONTSHOW;
|