Update of /cvsroot/gc-linux/linux/drivers/video/logo
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv28099/drivers/video/logo
Modified Files:
Kconfig Makefile logo.c
Log Message:
Rewind to v2.6.29.
Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/video/logo/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Makefile 14 Sep 2008 19:20:31 -0000 1.7
--- Makefile 25 Oct 2009 18:33:47 -0000 1.8
***************
*** 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
--- 8,11 ----
Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/video/logo/Kconfig,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Kconfig 14 Sep 2008 19:20:31 -0000 1.8
--- Kconfig 25 Oct 2009 18:33:47 -0000 1.9
***************
*** 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"
--- 43,46 ----
Index: logo.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/video/logo/logo.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** logo.c 14 Sep 2008 19:20:31 -0000 1.7
--- logo.c 25 Oct 2009 18:33:47 -0000 1.8
***************
*** 28,32 ****
extern const struct linux_logo logo_blackfin_clut224;
extern const struct linux_logo logo_dec_clut224;
- extern const struct linux_logo logo_gcn_clut224;
extern const struct linux_logo logo_mac_clut224;
extern const struct linux_logo logo_parisc_clut224;
--- 28,31 ----
***************
*** 92,99 ****
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 */
--- 91,94 ----
|