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

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

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

Modified Files:
	Kconfig Makefile logo.c 
Log Message:
Merge gc-linux-v2.6.30.


Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/video/logo/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Makefile	25 Oct 2009 18:33:47 -0000	1.8
--- Makefile	25 Oct 2009 18:50:27 -0000	1.9
***************
*** 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.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Kconfig	25 Oct 2009 18:33:47 -0000	1.9
--- Kconfig	25 Oct 2009 18:50:27 -0000	1.10
***************
*** 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.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** logo.c	25 Oct 2009 18:33:47 -0000	1.8
--- logo.c	25 Oct 2009 18:50:27 -0000	1.9
***************
*** 28,31 ****
--- 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;
***************
*** 91,94 ****
--- 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 */