The patch titled
logo: move declarations of logos to linux_logo.h
has been removed from the -mm tree. Its filename was
logo-move-declarations-of-logos-to-linux_logoh.patch
This patch was dropped because sorry, I'd just bored of getting this to compile
------------------------------------------------------
Subject: logo: move declarations of logos to linux_logo.h
From: Marcin Slusarz <marcin.slusarz@xxxxxxxxx>
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 Slusarz <marcin.slusarz@xxxxxxxxx>
Cc: "Antonino A. Daplas" <adaplas@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/video/logo/logo.c | 13 -------------
include/linux/linux_logo.h | 13 +++++++++++++
scripts/pnmtologo.c | 6 +++---
3 files changed, 16 insertions(+), 16 deletions(-)
diff -puN drivers/video/logo/logo.c~logo-move-declarations-of-logos-to-linux_logoh drivers/video/logo/logo.c
--- a/drivers/video/logo/logo.c~logo-move-declarations-of-logos-to-linux_logoh
+++ a/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 -puN include/linux/linux_logo.h~logo-move-declarations-of-logos-to-linux_logoh include/linux/linux_logo.h
--- a/include/linux/linux_logo.h~logo-move-declarations-of-logos-to-linux_logoh
+++ a/include/linux/linux_logo.h
@@ -42,4 +42,17 @@ static inline void fb_append_extra_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 -puN scripts/pnmtologo.c~logo-move-declarations-of-logos-to-linux_logoh scripts/pnmtologo.c
--- a/scripts/pnmtologo.c~logo-move-declarations-of-logos-to-linux_logoh
+++ a/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++) {
_
Patches currently in -mm which might be from marcin.slusarz@xxxxxxxxx are
git-alsa.patch
ehci-hcd-fix-sparse-warning-about-shadowing-status-symbol-checkpatch-fixes.patch
vgacon-fix-sparse-warning-about-shadowing-i-symbol.patch
fbcon-fix-sparse-warning-about-shadowing-p-symbol.patch
fbcon-fix-sparse-warning-about-shadowing-rotate-symbol.patch
logo-move-declarations-of-logos-to-linux_logoh.patch
logo-move-declarations-of-logos-to-linux_logoh-fix.patch
udf-remove-wrong-prototype-of-udf_readdir.patch
udf-improve-readability-of-do_udf_readdir.patch
udf-fix-coding-style-of-dirc.patch
udf-fix-3-signedness-1-unitialized-variable-warnings.patch
udf-fix-signedness-issue.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
