[Gc-linux-cvs] linux/drivers/video/logo Kconfig, 1.10, 1.11 Makefile, 1.9, 1.10 logo.c, 1.9, 1.10

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

Update of /cvsroot/gc-linux/linux/drivers/video/logo
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31851/drivers/video/logo

Modified Files:
	Kconfig Makefile logo.c 
Log Message:
Rewind to v2.6.30.


Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/video/logo/Makefile,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Makefile	25 Oct 2009 18:50:27 -0000	1.9
--- Makefile	25 Oct 2009 18:53:46 -0000	1.10
***************
*** 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.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Kconfig	25 Oct 2009 18:50:27 -0000	1.10
--- Kconfig	25 Oct 2009 18:53:46 -0000	1.11
***************
*** 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.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** logo.c	25 Oct 2009 18:50:27 -0000	1.9
--- logo.c	25 Oct 2009 18:53:46 -0000	1.10
***************
*** 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 ----