diff -urN -X dontdiff linux-2.4.18-pre9/drivers/video/fbcon.c linux-2.4.18-pre9-logo/drivers/video/fbcon.c --- linux-2.4.18-pre9/drivers/video/fbcon.c Mon Oct 15 13:47:13 2001 +++ linux-2.4.18-pre9-logo/drivers/video/fbcon.c Fri Feb 8 16:57:04 2002 @@ -109,8 +109,6 @@ # define DPRINTK(fmt, args...) #endif -#define LOGO_H 80 -#define LOGO_W 80 #define LOGO_LINE (LOGO_W/8) struct display fb_display[MAX_NR_CONSOLES]; diff -urN -X dontdiff linux-2.4.18-pre9/include/asm-m68k/linux_logo.h linux-2.4.18-pre9-logo/include/asm-m68k/linux_logo.h --- linux-2.4.18-pre9/include/asm-m68k/linux_logo.h Tue Jun 12 10:39:50 2001 +++ linux-2.4.18-pre9-logo/include/asm-m68k/linux_logo.h Fri Feb 8 16:57:04 2002 @@ -29,6 +29,8 @@ #define __HAVE_ARCH_LINUX_LOGO #define LINUX_LOGO_COLORS 185 +#define LOGO_H 80 +#define LOGO_W 80 #ifdef INCLUDE_LINUX_LOGO_DATA diff -urN -X dontdiff linux-2.4.18-pre9/include/asm-mips/linux_logo_dec.h linux-2.4.18-pre9-logo/include/asm-mips/linux_logo_dec.h --- linux-2.4.18-pre9/include/asm-mips/linux_logo_dec.h Sun Sep 9 10:43:01 2001 +++ linux-2.4.18-pre9-logo/include/asm-mips/linux_logo_dec.h Fri Feb 8 16:57:04 2002 @@ -15,6 +15,8 @@ #define linux_logo_banner "Linux/MIPSel version " UTS_RELEASE #define LINUX_LOGO_COLORS 183 +#define LOGO_H 80 +#define LOGO_W 80 #define __HAVE_ARCH_LINUX_LOGO diff -urN -X dontdiff linux-2.4.18-pre9/include/asm-mips/linux_logo_sgi.h linux-2.4.18-pre9-logo/include/asm-mips/linux_logo_sgi.h --- linux-2.4.18-pre9/include/asm-mips/linux_logo_sgi.h Sun Sep 9 10:43:01 2001 +++ linux-2.4.18-pre9-logo/include/asm-mips/linux_logo_sgi.h Fri Feb 8 16:57:04 2002 @@ -15,6 +15,8 @@ #define linux_logo_banner "Linux/MIPS version " UTS_RELEASE #define LINUX_LOGO_COLORS 212 +#define LOGO_H 80 +#define LOGO_W 80 #define __HAVE_ARCH_LINUX_LOGO diff -urN -X dontdiff linux-2.4.18-pre9/include/asm-mips64/linux_logo.h linux-2.4.18-pre9-logo/include/asm-mips64/linux_logo.h --- linux-2.4.18-pre9/include/asm-mips64/linux_logo.h Sun Sep 9 10:43:02 2001 +++ linux-2.4.18-pre9-logo/include/asm-mips64/linux_logo.h Fri Feb 8 16:57:04 2002 @@ -26,6 +26,8 @@ #define __HAVE_ARCH_LINUX_LOGO #define LINUX_LOGO_COLORS 187 +#define LOGO_H 80 +#define LOGO_W 80 #ifdef INCLUDE_LINUX_LOGO_DATA diff -urN -X dontdiff linux-2.4.18-pre9/include/asm-sh/linux_logo.h linux-2.4.18-pre9-logo/include/asm-sh/linux_logo.h --- linux-2.4.18-pre9/include/asm-sh/linux_logo.h Sat Sep 8 12:29:09 2001 +++ linux-2.4.18-pre9-logo/include/asm-sh/linux_logo.h Fri Feb 8 16:57:04 2002 @@ -29,6 +29,8 @@ #define __HAVE_ARCH_LINUX_LOGOBW 1 #define LINUX_LOGO_COLORS 160 +#define LOGO_H 80 +#define LOGO_W 80 #ifdef INCLUDE_LINUX_LOGO_DATA diff -urN -X dontdiff linux-2.4.18-pre9/include/asm-sparc/linux_logo.h linux-2.4.18-pre9-logo/include/asm-sparc/linux_logo.h --- linux-2.4.18-pre9/include/asm-sparc/linux_logo.h Tue Jun 12 11:08:46 2001 +++ linux-2.4.18-pre9-logo/include/asm-sparc/linux_logo.h Fri Feb 8 16:57:04 2002 @@ -27,6 +27,8 @@ #define __HAVE_ARCH_LINUX_LOGO16 #define LINUX_LOGO_COLORS 221 +#define LOGO_H 80 +#define LOGO_W 80 #ifdef INCLUDE_LINUX_LOGO_DATA diff -urN -X dontdiff linux-2.4.18-pre9/include/asm-sparc64/linux_logo.h linux-2.4.18-pre9-logo/include/asm-sparc64/linux_logo.h --- linux-2.4.18-pre9/include/asm-sparc64/linux_logo.h Tue Jun 12 11:08:46 2001 +++ linux-2.4.18-pre9-logo/include/asm-sparc64/linux_logo.h Fri Feb 8 16:57:04 2002 @@ -27,6 +27,8 @@ #define __HAVE_ARCH_LINUX_LOGO16 #define LINUX_LOGO_COLORS 221 +#define LOGO_H 80 +#define LOGO_W 80 #ifdef INCLUDE_LINUX_LOGO_DATA diff -urN -X dontdiff linux-2.4.18-pre9/include/linux/linux_logo.h linux-2.4.18-pre9-logo/include/linux/linux_logo.h --- linux-2.4.18-pre9/include/linux/linux_logo.h Mon Jun 11 19:15:27 2001 +++ linux-2.4.18-pre9-logo/include/linux/linux_logo.h Fri Feb 8 16:57:04 2002 @@ -26,6 +26,9 @@ #ifndef __HAVE_ARCH_LINUX_LOGO +#define LOGO_H 80 +#define LOGO_W 80 + unsigned char linux_logo_red[] __initdata = { 0x00, 0x06, 0x0a, 0x0e, 0x16, 0x1a, 0x1e, 0x22, 0x12, 0x00, 0x2a, 0x36, 0x42, 0x4e, 0x4a, 0x56,