Merge branch 'upstream' of git://git.infradead.org/~dedekind/ubi-2.6

[mv-sheeva.git] / drivers / video / logo / Makefile

diff --git a/drivers/video/logo/Makefile b/drivers/video/logo/Makefile
index d0244c04af5a71b11de61925c55fb9a001442ffd..a5fc4edf84e6abc506ea099d3d635c90c6b27c9e 100644 (file)
--- a/drivers/video/logo/Makefile
+++ b/drivers/video/logo/Makefile
@@ -14,9 +14,11 @@ obj-$(CONFIG_LOGO_SUPERH_VGA16)              += logo_superh_vga16.o
 obj-$(CONFIG_LOGO_SUPERH_CLUT224)      += logo_superh_clut224.o
 obj-$(CONFIG_LOGO_M32R_CLUT224)                += logo_m32r_clut224.o
 
+obj-$(CONFIG_SPU_BASE)                 += logo_spe_clut224.o
+
 # How to generate logo's
 
-# Use logo-cfiles to retreive list of .c files to be built
+# Use logo-cfiles to retrieve list of .c files to be built
 logo-cfiles = $(notdir $(patsubst %.$(2), %.c, \
               $(wildcard $(srctree)/$(src)/*$(1).$(2))))
 
@@ -34,7 +36,7 @@ extra-y += $(call logo-cfiles,_clut224,ppm)
 extra-y += $(call logo-cfiles,_gray256,pgm)
 
 # Create commands like "pnmtologo -t mono -n logo_mac_mono -o ..."
-quiet_cmd_logo = LOGO  $@
+quiet_cmd_logo = LOGO    $@
        cmd_logo = scripts/pnmtologo \
                        -t $(patsubst $*_%,%,$(notdir $(basename $<))) \
                        -n $(notdir $(basename $<)) -o $@ $<