[LV-k25-commit] kernel-2.5/drivers/video/logo logo.c,1.5,1.6

[Jan-Benedict G. <jb...@us...>]

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

Modified Files:
	logo.c 
Log Message:
- This looks like a merge conflict.


Index: logo.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/video/logo/logo.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- logo.c	24 Jul 2005 21:43:57 -0000	1.5
+++ logo.c	31 Jul 2005 16:23:48 -0000	1.6
@@ -60,23 +60,19 @@
 		logo = &logo_superh_vga16;
 #endif
 	}
-	
+
 	if (depth >= 8) {
 #ifdef CONFIG_LOGO_LINUX_CLUT224
 		/* Generic Linux logo */
 		logo = &logo_linux_clut224;
 #endif
 #ifdef CONFIG_LOGO_DEC_CLUT224
-		/* DEC Linux logo on MIPS/MIPS64 or ALPHA */
-#ifndef CONFIG_ALPHA
+		/* DEC Linux logo on MIPS/MIPS64, VAX or ALPHA */
+#ifdef CONFIG_MIPS
 		if (mips_machgroup == MACH_GROUP_DEC)
 #endif
 			logo = &logo_dec_clut224;
 #endif
-#ifdef CONFIG_VAX
-		logo = &logo_dec_clut224;
-#endif
-#endif
 #ifdef CONFIG_LOGO_MAC_CLUT224
 		/* Macintosh Linux logo on m68k */
 		if (MACH_IS_MAC)