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

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

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

Modified Files:
	Kconfig logo.c 
Log Message:
Merge with 2.6.12


Index: Kconfig
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/video/logo/Kconfig,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Kconfig	28 Mar 2005 00:01:02 -0000	1.3
+++ Kconfig	24 Jul 2005 21:43:57 -0000	1.4
@@ -25,7 +25,7 @@
 
 config LOGO_DEC_CLUT224
 	bool "224-color Digital Equipment Corporation Linux logo"
-	depends on LOGO && (MACH_DECSTATION || VAX)
+	depends on LOGO && (MACH_DECSTATION || ALPHA || VAX)
 	default y
 
 config LOGO_MAC_CLUT224
@@ -45,7 +45,7 @@
 
 config LOGO_SUN_CLUT224
 	bool "224-color Sun Linux logo"
-	depends on LOGO && (SPARC || SPARC64)
+	depends on LOGO && (SPARC32 || SPARC64)
 	default y
 
 config LOGO_SUPERH_MONO

Index: logo.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/video/logo/logo.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- logo.c	2 Sep 2004 19:51:19 -0000	1.4
+++ logo.c	24 Jul 2005 21:43:57 -0000	1.5
@@ -12,6 +12,7 @@
 #include <linux/config.h>
 #include <linux/linux_logo.h>
 #include <linux/stddef.h>
+#include <linux/module.h>
 
 #ifdef CONFIG_M68K
 #include <asm/setup.h>
@@ -66,9 +67,10 @@
 		logo = &logo_linux_clut224;
 #endif
 #ifdef CONFIG_LOGO_DEC_CLUT224
-		/* DEC Linux logo on DECstations and VAXstations */
-#ifdef CONFIG_DECSTATION
+		/* DEC Linux logo on MIPS/MIPS64 or ALPHA */
+#ifndef CONFIG_ALPHA
 		if (mips_machgroup == MACH_GROUP_DEC)
+#endif
 			logo = &logo_dec_clut224;
 #endif
 #ifdef CONFIG_VAX
@@ -102,4 +104,4 @@
 	}
 	return logo;
 }
-
+EXPORT_SYMBOL_GPL(fb_find_logo);