Update of /cvsroot/gc-linux/linux/drivers/video/logo
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv22540/drivers/video/logo
Modified Files:
Kconfig Makefile logo.c
Log Message:
Merge v2.6.32.
Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/video/logo/Makefile,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Makefile 9 Dec 2009 18:18:07 -0000 1.13
--- Makefile 9 Dec 2009 18:44:55 -0000 1.14
***************
*** 8,11 ****
--- 8,12 ----
obj-$(CONFIG_LOGO_BLACKFIN_VGA16) += logo_blackfin_vga16.o
obj-$(CONFIG_LOGO_DEC_CLUT224) += logo_dec_clut224.o
+ obj-$(CONFIG_LOGO_GAMECUBE_CLUT224) += logo_gcn_clut224.o
obj-$(CONFIG_LOGO_MAC_CLUT224) += logo_mac_clut224.o
obj-$(CONFIG_LOGO_PARISC_CLUT224) += logo_parisc_clut224.o
Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/video/logo/Kconfig,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Kconfig 9 Dec 2009 18:18:07 -0000 1.13
--- Kconfig 9 Dec 2009 18:44:55 -0000 1.14
***************
*** 43,46 ****
--- 43,51 ----
default y
+ config LOGO_GAMECUBE_CLUT224
+ bool "224-color GameCube Linux logo"
+ depends on GAMECUBE
+ default y
+
config LOGO_MAC_CLUT224
bool "224-color Macintosh Linux logo"
Index: logo.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/video/logo/logo.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** logo.c 9 Dec 2009 18:18:07 -0000 1.13
--- logo.c 9 Dec 2009 18:44:55 -0000 1.14
***************
*** 76,79 ****
--- 76,83 ----
logo = &logo_dec_clut224;
#endif
+ #ifdef CONFIG_LOGO_GAMECUBE_CLUT224
+ /* GameCube Linux logo */
+ logo = &logo_gcn_clut224;
+ #endif
#ifdef CONFIG_LOGO_MAC_CLUT224
/* Macintosh Linux logo on m68k */
|
