summaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert+renesas@glider.be>2024-06-12 15:41:17 +0200
committerHelge Deller <deller@gmx.de>2024-06-13 23:05:26 +0200
commit3dc59489fda386bd3fedbb1787ee08619afd5aee (patch)
treeb5da0032b652018e5ef5c0b286121cde3e10bf20 /drivers/video
parentLinux 6.10-rc3 (diff)
downloadlinux-3dc59489fda386bd3fedbb1787ee08619afd5aee.tar.xz
linux-3dc59489fda386bd3fedbb1787ee08619afd5aee.zip
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>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/logo/pnmtologo.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/logo/pnmtologo.c b/drivers/video/logo/pnmtologo.c
index 8080c4d9c4a2..28d9f0b907a9 100644
--- a/drivers/video/logo/pnmtologo.c
+++ b/drivers/video/logo/pnmtologo.c
@@ -238,7 +238,7 @@ static void write_header(void)
fprintf(out, " * Linux logo %s\n", logoname);
fputs(" */\n\n", out);
fputs("#include <linux/linux_logo.h>\n\n", out);
- fprintf(out, "static unsigned char %s_data[] __initdata = {\n",
+ fprintf(out, "static const unsigned char %s_data[] __initconst = {\n",
logoname);
}
@@ -375,7 +375,7 @@ static void write_logo_clut224(void)
fputs("\n};\n\n", out);
/* write logo clut */
- fprintf(out, "static unsigned char %s_clut[] __initdata = {\n",
+ fprintf(out, "static const unsigned char %s_clut[] __initconst = {\n",
logoname);
write_hex_cnt = 0;
for (i = 0; i < logo_clutsize; i++) {