diff -urN -X dontdiff linux-2.4.18-pre9/Makefile linux-2.4.18-pre9-logo/Makefile
--- linux-2.4.18-pre9/Makefile	Fri Dec 21 09:41:53 2001
+++ linux-2.4.18-pre9-logo/Makefile	Fri Feb  8 17:17:51 2002
@@ -191,6 +191,7 @@
 # files removed with 'make clean'
 CLEAN_FILES = \
 	kernel/ksyms.lst include/linux/compile.h \
+	include/video/linux_logo.h \
 	vmlinux System.map \
 	.tmp* \
 	drivers/char/consolemap_deftbl.c drivers/video/promcon_tbl.c \
@@ -228,6 +229,7 @@
 	.version .config* config.in config.old \
 	scripts/tkparse scripts/kconfig.tk scripts/kconfig.tmp \
 	scripts/lxdialog/*.o scripts/lxdialog/lxdialog \
+	scripts/tologo/*.o scripts/tologo/tologo \
 	.menuconfig.log \
 	include/asm \
 	.hdepend scripts/mkdep scripts/split-include scripts/docproc \
diff -urN -X dontdiff linux-2.4.18-pre9/arch/ppc/kernel/prom.c linux-2.4.18-pre9-logo/arch/ppc/kernel/prom.c
--- linux-2.4.18-pre9/arch/ppc/kernel/prom.c	Fri Dec 21 09:41:53 2001
+++ linux-2.4.18-pre9-logo/arch/ppc/kernel/prom.c	Fri Feb  8 17:17:51 2002
@@ -37,7 +37,7 @@
 #include "open_pic.h"
 
 #ifdef CONFIG_FB
-#include <asm/linux_logo.h>
+#include <video/linux_logo.h>
 #endif
 
 /*
diff -urN -X dontdiff linux-2.4.18-pre9/drivers/video/Makefile linux-2.4.18-pre9-logo/drivers/video/Makefile
--- linux-2.4.18-pre9/drivers/video/Makefile	Thu Oct 25 13:53:52 2001
+++ linux-2.4.18-pre9-logo/drivers/video/Makefile	Fri Feb  8 17:17:51 2002
@@ -151,3 +151,12 @@
 
 promcon_tbl.o: promcon_tbl.c $(TOPDIR)/include/linux/types.h
 
+$(TOPDIR)/scripts/tologo/tologo:
+	$(MAKE) -C $(TOPDIR)/scripts/tologo all
+
+$(TOPDIR)/include/video/linux_logo.h: $(TOPDIR)/scripts/tologo/tologo $(TOPDIR)/arch/$(ARCH)/linux_logo.ppm
+	$(TOPDIR)/scripts/tologo/tologo \
+	    $(TOPDIR)/arch/$(ARCH)/linux_logo.ppm \
+	    $(TOPDIR)/include/video/linux_logo.h
+
+fbcon.o: fbcon.c $(TOPDIR)/include/video/linux_logo.h
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	Fri Feb  8 17:04:01 2002
+++ linux-2.4.18-pre9-logo/drivers/video/fbcon.c	Fri Feb  8 17:17:51 2002
@@ -97,7 +97,7 @@
 #include <asm/io.h>
 #endif
 #define INCLUDE_LINUX_LOGO_DATA
-#include <asm/linux_logo.h>
+#include <video/linux_logo.h>
 
 #include <video/fbcon.h>
 #include <video/fbcon-mac.h>	/* for 6x11 font on mac */
diff -urN -X dontdiff linux-2.4.18-pre9/drivers/video/hgafb.c linux-2.4.18-pre9-logo/drivers/video/hgafb.c
--- linux-2.4.18-pre9/drivers/video/hgafb.c	Mon Nov 12 09:46:25 2001
+++ linux-2.4.18-pre9-logo/drivers/video/hgafb.c	Fri Feb  8 17:17:51 2002
@@ -50,7 +50,7 @@
 #ifdef MODULE
 
 #define INCLUDE_LINUX_LOGO_DATA
-#include <linux/linux_logo.h>
+#include <video/linux_logo.h>
 
 #endif /* MODULE */
 
diff -urN -X dontdiff linux-2.4.18-pre9/drivers/video/newport_con.c linux-2.4.18-pre9-logo/drivers/video/newport_con.c
--- linux-2.4.18-pre9/drivers/video/newport_con.c	Mon Oct 15 13:47:24 2001
+++ linux-2.4.18-pre9-logo/drivers/video/newport_con.c	Fri Feb  8 17:17:51 2002
@@ -28,7 +28,7 @@
 #include <asm/pgtable.h>
 #include <video/newport.h>
 #define INCLUDE_LINUX_LOGO_DATA
-#include <asm/linux_logo.h>
+#include <video/linux_logo.h>
 
 #include <video/font.h>