diff options
| author | James Morris <jmorris@namei.org> | 2009-07-14 00:30:40 +1000 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-07-14 00:30:40 +1000 |
| commit | 7d45ecafb6792ca68da9517969d37d910601845f (patch) | |
| tree | a98b1074e5577e66a97963745f975404d0aac266 /scripts/pnmtologo.c | |
| parent | be940d6279c30a2d7c4e8d1d5435f957f594d66d (diff) | |
| parent | 7638d5322bd89d49e013a03fe2afaeb6d214fabd (diff) | |
| download | linux-7d45ecafb6792ca68da9517969d37d910601845f.tar.gz | |
Merge branch 'master' into next
Conflicts:
include/linux/personality.h
Use Linus' version.
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'scripts/pnmtologo.c')
| -rw-r--r-- | scripts/pnmtologo.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/pnmtologo.c b/scripts/pnmtologo.c index 64f5ddb09ea626..5c113123ed9f20 100644 --- a/scripts/pnmtologo.c +++ b/scripts/pnmtologo.c @@ -237,7 +237,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 const unsigned char %s_data[] __initconst = {\n", + fprintf(out, "static unsigned char %s_data[] __initdata = {\n", logoname); } @@ -374,7 +374,7 @@ static void write_logo_clut224(void) fputs("\n};\n\n", out); /* write logo clut */ - fprintf(out, "static const unsigned char %s_clut[] __initconst = {\n", + fprintf(out, "static unsigned char %s_clut[] __initdata = {\n", logoname); write_hex_cnt = 0; for (i = 0; i < logo_clutsize; i++) { |