diff options
author | Tom Rini <trini@ti.com> | 2015-01-14 16:26:15 -0500 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2015-01-14 16:26:15 -0500 |
commit | 28c4dae114c9b94b2a1111d81d4da716e9fc2cba (patch) | |
tree | af724165971829de9394145db5dced80d6ef932b /common/Makefile | |
parent | 16ae7827226ce8b255245d1932e8069f00997a26 (diff) | |
parent | 73b462b84568ac887ae9ad083580289175202327 (diff) | |
download | u-boot-imx-28c4dae114c9b94b2a1111d81d4da716e9fc2cba.zip u-boot-imx-28c4dae114c9b94b2a1111d81d4da716e9fc2cba.tar.gz u-boot-imx-28c4dae114c9b94b2a1111d81d4da716e9fc2cba.tar.bz2 |
Merge branch 'next' of git://git.denx.de/u-boot-video
Diffstat (limited to 'common/Makefile')
-rw-r--r-- | common/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/Makefile b/common/Makefile index c668a2f..94554f2 100644 --- a/common/Makefile +++ b/common/Makefile @@ -196,7 +196,7 @@ obj-$(CONFIG_CMD_KGDB) += kgdb.o kgdb_stubs.o obj-$(CONFIG_I2C_EDID) += edid.o obj-$(CONFIG_KALLSYMS) += kallsyms.o obj-y += splash.o -obj-$(CONFIG_LCD) += lcd.o +obj-$(CONFIG_LCD) += lcd.o lcd_console.o obj-$(CONFIG_LYNXKDI) += lynxkdi.o obj-$(CONFIG_MENU) += menu.o obj-$(CONFIG_MODEM_SUPPORT) += modem.o |