Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

video/logo: Make logo data const again

As gcc-4.1 is no longer supported, the logo data can be made const
again. Hence revert commit 15e3252464432a29 ("fbdev: work around old
compiler bug").

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Helge Deller <deller@gmx.de>

authored by

Geert Uytterhoeven and committed by
Helge Deller
3dc59489 83a7eefe

+2 -2
+2 -2
drivers/video/logo/pnmtologo.c
··· 238 238 fprintf(out, " * Linux logo %s\n", logoname); 239 239 fputs(" */\n\n", out); 240 240 fputs("#include <linux/linux_logo.h>\n\n", out); 241 - fprintf(out, "static unsigned char %s_data[] __initdata = {\n", 241 + fprintf(out, "static const unsigned char %s_data[] __initconst = {\n", 242 242 logoname); 243 243 } 244 244 ··· 375 375 fputs("\n};\n\n", out); 376 376 377 377 /* write logo clut */ 378 - fprintf(out, "static unsigned char %s_clut[] __initdata = {\n", 378 + fprintf(out, "static const unsigned char %s_clut[] __initconst = {\n", 379 379 logoname); 380 380 write_hex_cnt = 0; 381 381 for (i = 0; i < logo_clutsize; i++) {