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

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

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

Modified Files:
	Makefile logo.c 
Log Message:
Forward to v2.6.31.


Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/video/logo/Makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Makefile	25 Oct 2009 18:53:46 -0000	1.10
--- Makefile	25 Oct 2009 18:56:56 -0000	1.11
***************
*** 38,57 ****
  extra-y += $(call logo-cfiles,_gray256,pgm)
  
  # Create commands like "pnmtologo -t mono -n logo_mac_mono -o ..."
  quiet_cmd_logo = LOGO    $@
! 	cmd_logo = scripts/pnmtologo \
  			-t $(patsubst $*_%,%,$(notdir $(basename $<))) \
  			-n $(notdir $(basename $<)) -o $@ $<
  
! $(obj)/%_mono.c: $(src)/%_mono.pbm FORCE
  	$(call if_changed,logo)
  
! $(obj)/%_vga16.c: $(src)/%_vga16.ppm FORCE
  	$(call if_changed,logo)
  
! $(obj)/%_clut224.c: $(src)/%_clut224.ppm FORCE
  	$(call if_changed,logo)
  
! $(obj)/%_gray256.c: $(src)/%_gray256.pgm FORCE
  	$(call if_changed,logo)
  
--- 38,59 ----
  extra-y += $(call logo-cfiles,_gray256,pgm)
  
+ pnmtologo := scripts/pnmtologo
+ 
  # Create commands like "pnmtologo -t mono -n logo_mac_mono -o ..."
  quiet_cmd_logo = LOGO    $@
! 	cmd_logo = $(pnmtologo) \
  			-t $(patsubst $*_%,%,$(notdir $(basename $<))) \
  			-n $(notdir $(basename $<)) -o $@ $<
  
! $(obj)/%_mono.c: $(src)/%_mono.pbm $(pnmtologo) FORCE
  	$(call if_changed,logo)
  
! $(obj)/%_vga16.c: $(src)/%_vga16.ppm $(pnmtologo) FORCE
  	$(call if_changed,logo)
  
! $(obj)/%_clut224.c: $(src)/%_clut224.ppm $(pnmtologo) FORCE
  	$(call if_changed,logo)
  
! $(obj)/%_gray256.c: $(src)/%_gray256.pgm $(pnmtologo) FORCE
  	$(call if_changed,logo)
  

Index: logo.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/video/logo/logo.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** logo.c	25 Oct 2009 18:53:46 -0000	1.10
--- logo.c	25 Oct 2009 18:56:56 -0000	1.11
***************
*** 22,40 ****
  #endif
  
- extern const struct linux_logo logo_linux_mono;
- extern const struct linux_logo logo_linux_vga16;
- extern const struct linux_logo logo_linux_clut224;
- extern const struct linux_logo logo_blackfin_vga16;
- extern const struct linux_logo logo_blackfin_clut224;
- extern const struct linux_logo logo_dec_clut224;
- extern const struct linux_logo logo_mac_clut224;
- extern const struct linux_logo logo_parisc_clut224;
- extern const struct linux_logo logo_sgi_clut224;
- extern const struct linux_logo logo_sun_clut224;
- extern const struct linux_logo logo_superh_mono;
- extern const struct linux_logo logo_superh_vga16;
- extern const struct linux_logo logo_superh_clut224;
- extern const struct linux_logo logo_m32r_clut224;
- 
  static int nologo;
  module_param(nologo, bool, 0);
--- 22,25 ----