diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-06-22 17:54:39 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-06-22 17:59:04 +1000 |
| commit | 0ba42448f25c4814200e380a42c42433e0ac0034 (patch) | |
| tree | 857ac38fd1d9d4e4389ddfa984849e0201cda4cf | |
| parent | 86a1681189858fa59eceacb73e6669e34d97067c (diff) | |
fbdev: work around old compiler bug
When building with a 4.1.x compiler on powerpc64 (at least) we get
this error:
drivers/video/logo/logo_linux_mono.c:81: error: logo_linux_mono causes a section type conflict
This was introduced by commit ae52bb2384f721562f15f719de1acb8e934733cb
("fbdev: move logo externs to header file"). This is a partial revert
of that commit sufficient to not hit the compiler bug.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | scripts/pnmtologo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/pnmtologo.c b/scripts/pnmtologo.c index 64f5ddb09ea6..d10c38939289 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); } |