From: "Marcin Ślusarz" <marcin.slusarz@gmail.com>
To: linux-kernel@vger.kernel.org
Cc: Antonino Daplas <adaplas@gmail.com>,
Andrew Morton <akpm@linux-foundation.org>
Subject: [PATCH] logo: move declarations of logos to linux_logo.h
Date: Sun, 9 Dec 2007 22:40:31 +0100 [thread overview]
Message-ID: <20071209214027.GG9440@joi> (raw)
logo: move declarations of logos to linux_logo.h
there was a mismatch between externs in logo.c and code generated by pnmtologo
(on old tree, you need to rm drivers/video/logo/logo_*.c before compilation)
Signed-off-by: Marcin Ślusarz <marcin.slusarz@gmail.com>
---
drivers/video/logo/logo.c | 13 -------------
include/linux/linux_logo.h | 13 +++++++++++++
scripts/pnmtologo.c | 6 +++---
3 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/drivers/video/logo/logo.c b/drivers/video/logo/logo.c
index fc72684..f5a0cd3 100644
--- a/drivers/video/logo/logo.c
+++ b/drivers/video/logo/logo.c
@@ -21,19 +21,6 @@
#include <asm/bootinfo.h>
#endif
-extern const struct linux_logo logo_linux_mono;
-extern const struct linux_logo logo_linux_vga16;
-extern const struct linux_logo logo_linux_clut224;
-extern const struct linux_logo logo_dec_clut224;
-extern const struct linux_logo logo_mac_clut224;
-extern const struct linux_logo logo_parisc_clut224;
-extern const struct linux_logo logo_sgi_clut224;
-extern const struct linux_logo logo_sun_clut224;
-extern const struct linux_logo logo_superh_mono;
-extern const struct linux_logo logo_superh_vga16;
-extern const struct linux_logo logo_superh_clut224;
-extern const struct linux_logo logo_m32r_clut224;
-
static int nologo;
module_param(nologo, bool, 0);
MODULE_PARM_DESC(nologo, "Disables startup logo");
diff --git a/include/linux/linux_logo.h b/include/linux/linux_logo.h
index 08a9296..da9fb79 100644
--- a/include/linux/linux_logo.h
+++ b/include/linux/linux_logo.h
@@ -42,4 +42,17 @@ static inline void fb_append_extra_logo(const struct linux_logo *logo,
{}
#endif
+extern const struct linux_logo logo_linux_mono;
+extern const struct linux_logo logo_linux_vga16;
+extern const struct linux_logo logo_linux_clut224;
+extern const struct linux_logo logo_dec_clut224;
+extern const struct linux_logo logo_mac_clut224;
+extern const struct linux_logo logo_parisc_clut224;
+extern const struct linux_logo logo_sgi_clut224;
+extern const struct linux_logo logo_sun_clut224;
+extern const struct linux_logo logo_superh_mono;
+extern const struct linux_logo logo_superh_vga16;
+extern const struct linux_logo logo_superh_clut224;
+extern const struct linux_logo logo_m32r_clut224;
+
#endif /* _LINUX_LINUX_LOGO_H */
diff --git a/scripts/pnmtologo.c b/scripts/pnmtologo.c
index 6aa2a24..3048431 100644
--- a/scripts/pnmtologo.c
+++ b/scripts/pnmtologo.c
@@ -237,14 +237,14 @@ 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[] __initdata = {\n",
logoname);
}
static void write_footer(void)
{
fputs("\n};\n\n", out);
- fprintf(out, "struct linux_logo %s __initdata = {\n", logoname);
+ fprintf(out, "const struct linux_logo %s __initdata = {\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);
@@ -374,7 +374,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[] __initdata = {\n",
logoname);
write_hex_cnt = 0;
for (i = 0; i < logo_clutsize; i++) {
next reply other threads:[~2007-12-09 21:39 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-12-09 21:40 Marcin Ślusarz [this message]
2007-12-13 10:31 ` [PATCH] logo: move declarations of logos to linux_logo.h Andrew Morton
2007-12-13 19:50 ` Marcin Ślusarz
2007-12-13 19:55 ` Sam Ravnborg
2007-12-13 21:31 ` Marcin Slusarz
2007-12-14 20:49 ` [Linux-fbdev-devel] " Geert Uytterhoeven
2007-12-14 22:00 ` Sam Ravnborg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20071209214027.GG9440@joi \
--to=marcin.slusarz@gmail.com \
--cc=adaplas@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox