[Gc-linux-cvs] linux/drivers/video/logo Kconfig, 1.6, 1.7 Makefile, 1.5, 1.6 logo.c, 1.4, 1.5

[Albert H. <he...@us...>]

Update of /cvsroot/gc-linux/linux/drivers/video/logo
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv29560/drivers/video/logo

Modified Files:
	Kconfig Makefile logo.c 
Log Message:
Merged 2.6.23.


Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/video/logo/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile	21 Jun 2006 18:56:06 -0000	1.5
+++ Makefile	16 Nov 2007 23:26:09 -0000	1.6
@@ -15,6 +15,8 @@
 obj-$(CONFIG_LOGO_SUPERH_CLUT224)	+= logo_superh_clut224.o
 obj-$(CONFIG_LOGO_M32R_CLUT224)		+= logo_m32r_clut224.o
 
+obj-$(CONFIG_SPU_BASE)			+= logo_spe_clut224.o
+
 # How to generate logo's
 
 # Use logo-cfiles to retrieve list of .c files to be built

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/video/logo/Kconfig,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Kconfig	14 Nov 2007 23:08:56 -0000	1.6
+++ Kconfig	16 Nov 2007 23:26:09 -0000	1.7
@@ -10,6 +10,11 @@
 
 if LOGO
 
+config FB_LOGO_EXTRA
+	bool
+	depends on FB=y
+	default y if SPU_BASE
+
 config LOGO_LINUX_MONO
 	bool "Standard black and white Linux logo"
 	default y
@@ -29,7 +34,7 @@
 
 config LOGO_GAMECUBE_CLUT224
 	bool "224-color GameCube Linux logo"
-	depends on LOGO && GAMECUBE
+	depends on GAMECUBE
 	default y
 
 config LOGO_MAC_CLUT224

Index: logo.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/video/logo/logo.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- logo.c	17 Feb 2007 23:43:41 -0000	1.4
+++ logo.c	16 Nov 2007 23:26:09 -0000	1.5
@@ -35,8 +35,11 @@
 extern const struct linux_logo logo_superh_clut224;
 extern const struct linux_logo logo_m32r_clut224;
 
-
-const struct linux_logo *fb_find_logo(int depth)
+/* logo's are marked __initdata. Use __init_refok to tell
+ * modpost that it is intended that this function uses data
+ * marked __initdata.
+ */
+const struct linux_logo * __init_refok fb_find_logo(int depth)
 {
 	const struct linux_logo *logo = NULL;