diff options
| author | Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com> | 2009-06-16 18:34:19 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-16 22:47:57 -0400 |
| commit | ae52bb2384f721562f15f719de1acb8e934733cb (patch) | |
| tree | 099e280e526a9aa3f8b44975b4494bd364c21861 /include | |
| parent | a53c9d5b7115173fba9f82ff8120b624ef206f48 (diff) | |
fbdev: move logo externs to header file
Now we have __initconst, we can finally move the external declarations for
the various Linux logo structures to <linux/linux_logo.h>.
James' ack dates back to the previous submission (way to long ago), when the
logos were still __initdata, which caused failures on some platforms with some
toolchain versions.
Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Acked-by: James Simmons <jsimmons@infradead.org>
Cc: Krzysztof Helt <krzysztof.h1@poczta.fm>
Cc: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/init.h | 2 | ||||
| -rw-r--r-- | include/linux/linux_logo.h | 16 |
2 files changed, 17 insertions, 1 deletions
diff --git a/include/linux/init.h b/include/linux/init.h index b2189803f19a..8c2c9989626d 100644 --- a/include/linux/init.h +++ b/include/linux/init.h | |||
| @@ -29,7 +29,7 @@ | |||
| 29 | * sign followed by value, e.g.: | 29 | * sign followed by value, e.g.: |
| 30 | * | 30 | * |
| 31 | * static int init_variable __initdata = 0; | 31 | * static int init_variable __initdata = 0; |
| 32 | * static char linux_logo[] __initdata = { 0x32, 0x36, ... }; | 32 | * static const char linux_logo[] __initconst = { 0x32, 0x36, ... }; |
| 33 | * | 33 | * |
| 34 | * Don't forget to initialize data not at file scope, i.e. within a function, | 34 | * Don't forget to initialize data not at file scope, i.e. within a function, |
| 35 | * as gcc otherwise puts the data into the bss section and not into the init | 35 | * as gcc otherwise puts the data into the bss section and not into the init |
diff --git a/include/linux/linux_logo.h b/include/linux/linux_logo.h index 08a92969c76e..ca5bd91d12e1 100644 --- a/include/linux/linux_logo.h +++ b/include/linux/linux_logo.h | |||
| @@ -32,6 +32,22 @@ struct linux_logo { | |||
| 32 | const unsigned char *data; | 32 | const unsigned char *data; |
| 33 | }; | 33 | }; |
| 34 | 34 | ||
| 35 | extern const struct linux_logo logo_linux_mono; | ||
| 36 | extern const struct linux_logo logo_linux_vga16; | ||
| 37 | extern const struct linux_logo logo_linux_clut224; | ||
| 38 | extern const struct linux_logo logo_blackfin_vga16; | ||
| 39 | extern const struct linux_logo logo_blackfin_clut224; | ||
| 40 | extern const struct linux_logo logo_dec_clut224; | ||
| 41 | extern const struct linux_logo logo_mac_clut224; | ||
| 42 | extern const struct linux_logo logo_parisc_clut224; | ||
| 43 | extern const struct linux_logo logo_sgi_clut224; | ||
| 44 | extern const struct linux_logo logo_sun_clut224; | ||
| 45 | extern const struct linux_logo logo_superh_mono; | ||
| 46 | extern const struct linux_logo logo_superh_vga16; | ||
| 47 | extern const struct linux_logo logo_superh_clut224; | ||
| 48 | extern const struct linux_logo logo_m32r_clut224; | ||
| 49 | extern const struct linux_logo logo_spe_clut224; | ||
| 50 | |||
| 35 | extern const struct linux_logo *fb_find_logo(int depth); | 51 | extern const struct linux_logo *fb_find_logo(int depth); |
| 36 | #ifdef CONFIG_FB_LOGO_EXTRA | 52 | #ifdef CONFIG_FB_LOGO_EXTRA |
| 37 | extern void fb_append_extra_logo(const struct linux_logo *logo, | 53 | extern void fb_append_extra_logo(const struct linux_logo *logo, |