diff options
author | Ralf Baechle <ralf@linux-mips.org> | 1998-09-19 19:15:08 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 1998-09-19 19:15:08 +0000 |
commit | 03ba4131783cc9e872f8bb26a03f15bc11f27564 (patch) | |
tree | 88db8dba75ae06ba3bad08e42c5e52efc162535c /include/asm-arm/linux_logo.h | |
parent | 257730f99381dd26e10b832fce4c94cae7ac1176 (diff) |
- Merge with Linux 2.1.121.
- Bugfixes.
Diffstat (limited to 'include/asm-arm/linux_logo.h')
-rw-r--r-- | include/asm-arm/linux_logo.h | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/include/asm-arm/linux_logo.h b/include/asm-arm/linux_logo.h index b10646254..9eeae3619 100644 --- a/include/asm-arm/linux_logo.h +++ b/include/asm-arm/linux_logo.h @@ -11,17 +11,26 @@ #define linux_logo_banner "ARM Linux version " UTS_RELEASE -#define LINUX_LOGO_COLORS 0 +#define LINUX_LOGO_COLORS 221 -unsigned char linux_logo_red[] __initdata = { }; -unsigned char linux_logo_green[] __initdata = { }; -unsigned char linux_logo_blue[] __initdata = { }; +#ifdef INCLUDE_LINUX_LOGO_DATA -unsigned char linux_logo16_red[] __initdata = { }; -unsigned char linux_logo16_green[] __initdata = { }; -unsigned char linux_logo16_blue[] __initdata = { }; +#define INCLUDE_LINUX_LOGO16 +#include <linux/linux_logo.h> -unsigned char linux_logo[] __initdata = { }; -unsigned char linux_logo16[] __initdata = { }; -unsigned char linux_logo_bw[] __initdata = { }; +/* prototypes only */ +extern unsigned char linux_logo_red[]; +extern unsigned char linux_logo_green[]; +extern unsigned char linux_logo_blue[]; +extern unsigned char linux_logo[]; +extern unsigned char linux_logo_bw[]; +extern unsigned char linux_logo16_red[]; +extern unsigned char linux_logo16_green[]; +extern unsigned char linux_logo16_blue[]; +extern unsigned char linux_logo16[]; +extern unsigned char *linux_serial_image; + +extern int (*console_show_logo)(void); + +#endif |