[LV-k25-commit] kernel-2.5/drivers/video/logo logo.c,1.2,1.3

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/drivers/video/logo
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15149/drivers/video/logo

Modified Files:
	logo.c 
Log Message:
Merge with 2.6.7


Index: logo.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/video/logo/logo.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- logo.c	10 Oct 2003 21:09:25 -0000	1.2
+++ logo.c	28 Jul 2004 22:49:19 -0000	1.3
@@ -16,7 +16,7 @@
 #include <asm/setup.h>
 #endif
 
-#if defined(CONFIG_MIPS) || defined(CONFIG_MIPS64)
+#ifdef CONFIG_MIPS
 #include <asm/bootinfo.h>
 #endif