The patch titled fbcon: make logo_height a local variable has been removed from the -mm tree. Its filename was fbcon-make-logo_height-a-local-variable.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: fbcon: make logo_height a local variable From: Krzysztof Helt <krzysztof.h1@xxxxx> Make logo_height variable local in the only function it is used. Signed-off-by: Krzysztof Helt <krzysztof.h1@xxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/video/console/fbcon.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff -puN drivers/video/console/fbcon.c~fbcon-make-logo_height-a-local-variable drivers/video/console/fbcon.c --- a/drivers/video/console/fbcon.c~fbcon-make-logo_height-a-local-variable +++ a/drivers/video/console/fbcon.c @@ -107,9 +107,7 @@ static struct display fb_display[MAX_NR_ 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 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; _ Patches currently in -mm which might be from krzysztof.h1@xxxxx are origin.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html