From: Andrew Morton drivers/video/logo/logo_linux_clut224.c:598: error: conflicting type qualifiers for 'logo_linux_clut224' include/linux/linux_logo.h:47: error: previous declaration of 'logo_linux_clut224' was here Cc: "Antonino A. Daplas" Cc: Marcin Slusarz Signed-off-by: Andrew Morton --- drivers/video/logo/logo.c | 1 - scripts/pnmtologo.c | 2 +- video/logo/logo_linux_clut224.c | 0 3 files changed, 1 insertion(+), 2 deletions(-) diff -puN drivers/video/logo/logo.c~logo-move-declarations-of-logos-to-linux_logoh-fix drivers/video/logo/logo.c --- a/drivers/video/logo/logo.c~logo-move-declarations-of-logos-to-linux_logoh-fix +++ a/drivers/video/logo/logo.c @@ -1,4 +1,3 @@ - /* * Linux logo to be displayed on boot * diff -puN include/linux/linux_logo.h~logo-move-declarations-of-logos-to-linux_logoh-fix include/linux/linux_logo.h diff -puN scripts/pnmtologo.c~logo-move-declarations-of-logos-to-linux_logoh-fix scripts/pnmtologo.c --- a/scripts/pnmtologo.c~logo-move-declarations-of-logos-to-linux_logoh-fix +++ a/scripts/pnmtologo.c @@ -244,7 +244,7 @@ static void write_header(void) static void write_footer(void) { fputs("\n};\n\n", out); - fprintf(out, "const struct linux_logo %s __initdata = {\n", logoname); + fprintf(out, "const struct linux_logo %s = {\n", logoname); fprintf(out, " .type\t= %s,\n", logo_types[logo_type]); fprintf(out, " .width\t= %d,\n", logo_width); fprintf(out, " .height\t= %d,\n", logo_height); diff -puN drivers/video/logo/logo_linux_clut224.c~logo-move-declarations-of-logos-to-linux_logoh-fix drivers/video/logo/logo_linux_clut224.c _