From: Albert H. <he...@us...> - 2009-10-25 18:59:41
|
Update of /cvsroot/gc-linux/linux/drivers/video/logo In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv751/drivers/video/logo Modified Files: Kconfig Makefile logo.c Log Message: Merge gc-linux-v2.6.31. Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/video/logo/Makefile,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Makefile 25 Oct 2009 18:56:56 -0000 1.11 --- Makefile 25 Oct 2009 18:59:28 -0000 1.12 *************** *** 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.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Kconfig 25 Oct 2009 18:53:46 -0000 1.11 --- Kconfig 25 Oct 2009 18:59:28 -0000 1.12 *************** *** 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.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** logo.c 25 Oct 2009 18:56:56 -0000 1.11 --- logo.c 25 Oct 2009 18:59:28 -0000 1.12 *************** *** 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 */ |