diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2008-05-18 05:54:43 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2008-05-18 05:54:43 -0400 |
| commit | b4ef290d7c3abd1bf8cefcf8def359537fda7f31 (patch) | |
| tree | f3e270923fa36c773eee3bb1f9981aab1711d938 /drivers/video/logo/Makefile | |
| parent | 77b52b4c5c66175553ee59eb43f74366f1e54bde (diff) | |
| parent | f26a3988917913b3d11b2bd741601a2c64ab9204 (diff) | |
Merge branch 'linus' into x86/pat
Diffstat (limited to 'drivers/video/logo/Makefile')
| -rw-r--r-- | drivers/video/logo/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/video/logo/Makefile b/drivers/video/logo/Makefile index a5fc4edf84e6..b91251d1fe41 100644 --- a/drivers/video/logo/Makefile +++ b/drivers/video/logo/Makefile | |||
| @@ -4,6 +4,8 @@ obj-$(CONFIG_LOGO) += logo.o | |||
| 4 | obj-$(CONFIG_LOGO_LINUX_MONO) += logo_linux_mono.o | 4 | obj-$(CONFIG_LOGO_LINUX_MONO) += logo_linux_mono.o |
| 5 | obj-$(CONFIG_LOGO_LINUX_VGA16) += logo_linux_vga16.o | 5 | obj-$(CONFIG_LOGO_LINUX_VGA16) += logo_linux_vga16.o |
| 6 | obj-$(CONFIG_LOGO_LINUX_CLUT224) += logo_linux_clut224.o | 6 | obj-$(CONFIG_LOGO_LINUX_CLUT224) += logo_linux_clut224.o |
| 7 | obj-$(CONFIG_LOGO_BLACKFIN_CLUT224) += logo_blackfin_clut224.o | ||
| 8 | obj-$(CONFIG_LOGO_BLACKFIN_VGA16) += logo_blackfin_vga16.o | ||
| 7 | obj-$(CONFIG_LOGO_DEC_CLUT224) += logo_dec_clut224.o | 9 | obj-$(CONFIG_LOGO_DEC_CLUT224) += logo_dec_clut224.o |
| 8 | obj-$(CONFIG_LOGO_MAC_CLUT224) += logo_mac_clut224.o | 10 | obj-$(CONFIG_LOGO_MAC_CLUT224) += logo_mac_clut224.o |
| 9 | obj-$(CONFIG_LOGO_PARISC_CLUT224) += logo_parisc_clut224.o | 11 | obj-$(CONFIG_LOGO_PARISC_CLUT224) += logo_parisc_clut224.o |