Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

[linux-2.6] / drivers / video / logo / Makefile

diff --git a/drivers/video/logo/Makefile b/drivers/video/logo/Makefile
index a5fc4ed..b91251d 100644 (file)
--- a/drivers/video/logo/Makefile
+++ b/drivers/video/logo/Makefile
@@ -4,6 +4,8 @@ obj-$(CONFIG_LOGO)                      += logo.o
 obj-$(CONFIG_LOGO_LINUX_MONO)          += logo_linux_mono.o
 obj-$(CONFIG_LOGO_LINUX_VGA16)         += logo_linux_vga16.o
 obj-$(CONFIG_LOGO_LINUX_CLUT224)       += logo_linux_clut224.o
+obj-$(CONFIG_LOGO_BLACKFIN_CLUT224)    += logo_blackfin_clut224.o
+obj-$(CONFIG_LOGO_BLACKFIN_VGA16)      += logo_blackfin_vga16.o
 obj-$(CONFIG_LOGO_DEC_CLUT224)         += logo_dec_clut224.o
 obj-$(CONFIG_LOGO_MAC_CLUT224)         += logo_mac_clut224.o
 obj-$(CONFIG_LOGO_PARISC_CLUT224)      += logo_parisc_clut224.o