diff options
| author | Tom Rini <trini@ti.com> | 2014-10-26 14:03:08 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-10-26 14:03:08 -0400 |
| commit | 84a6df09c78bc9e9cbc6265d99c9097f5f1079f2 (patch) | |
| tree | 3b2bf1b3689e9aad0d20f5a69ada168cae3cc769 /drivers/serial/Makefile | |
| parent | c69ecd9722af22d50295eff81d0b9cd5b8adc2e0 (diff) | |
| parent | c2ded962d4703a3f9522553004db4a6fe540f7e6 (diff) | |
| download | talos-obmc-uboot-84a6df09c78bc9e9cbc6265d99c9097f5f1079f2.tar.gz talos-obmc-uboot-84a6df09c78bc9e9cbc6265d99c9097f5f1079f2.zip | |
Merge git://git.denx.de/u-boot-dm
Fix a trivial conflict over adding <dm.h>
Conflicts:
arch/arm/cpu/armv7/omap3/board.c
Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'drivers/serial/Makefile')
| -rw-r--r-- | drivers/serial/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile index 17c56ea66e..2c19ebc288 100644 --- a/drivers/serial/Makefile +++ b/drivers/serial/Makefile @@ -41,6 +41,8 @@ obj-$(CONFIG_MXS_AUART) += mxs_auart.o obj-$(CONFIG_ARC_SERIAL) += serial_arc.o obj-$(CONFIG_TEGRA_SERIAL) += serial_tegra.o obj-$(CONFIG_UNIPHIER_SERIAL) += serial_uniphier.o +obj-$(CONFIG_OMAP_SERIAL) += serial_omap.o +obj-$(CONFIG_COREBOOT_SERIAL) += serial_coreboot.o ifndef CONFIG_SPL_BUILD obj-$(CONFIG_USB_TTY) += usbtty.o |
