Merge remote-tracking branch 'remotes/tegra/android-tegra-2.6.36-honeycomb-mr1' into...

[firefly-linux-kernel-4.4.55.git] / drivers / serial / Makefile

diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile
old mode 100644 (file)
new mode 100755 (executable)
index f0faee6..8a29576
--- a/drivers/serial/Makefile
+++ b/drivers/serial/Makefile
@@ -83,6 +83,12 @@ obj-$(CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL) += nwpserial.o
 obj-$(CONFIG_SERIAL_KS8695) += serial_ks8695.o
 obj-$(CONFIG_KGDB_SERIAL_CONSOLE) += kgdboc.o
 obj-$(CONFIG_SERIAL_QE) += ucc_uart.o
+ifeq ($(CONFIG_SERIAL_RK29_STANDARD),y)
+obj-$(CONFIG_SERIAL_RK29) += rk_serial.o
+else
+obj-$(CONFIG_SERIAL_RK29) += rk29_serial.o
+endif
+obj-$(CONFIG_SERIAL_SC8800) += sc8800.o
 obj-$(CONFIG_SERIAL_TIMBERDALE)        += timbuart.o
 obj-$(CONFIG_SERIAL_GRLIB_GAISLER_APBUART) += apbuart.o
 obj-$(CONFIG_SERIAL_ALTERA_JTAGUART) += altera_jtaguart.o