Merge branch 'remove' of master.kernel.org:/home/rmk/linux-2.6-arm

[~andy/linux] / drivers / tty / serial / Makefile

diff --git a/drivers/tty/serial/Makefile b/drivers/tty/serial/Makefile
index 8e325408b1a6b77dbfbe8d4219f6a2a658b514a1..31e868cb49b2ea401ec8004266f34ac28608ac2b 100644 (file)
--- a/drivers/tty/serial/Makefile
+++ b/drivers/tty/serial/Makefile
@@ -75,6 +75,7 @@ obj-$(CONFIG_SERIAL_SGI_IOC3) += ioc3_serial.o
 obj-$(CONFIG_SERIAL_ATMEL) += atmel_serial.o
 obj-$(CONFIG_SERIAL_UARTLITE) += uartlite.o
 obj-$(CONFIG_SERIAL_MSM) += msm_serial.o
+obj-$(CONFIG_SERIAL_MSM_HS) += msm_serial_hs.o
 obj-$(CONFIG_SERIAL_NETX) += netx-serial.o
 obj-$(CONFIG_SERIAL_OF_PLATFORM) += of_serial.o
 obj-$(CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL) += nwpserial.o
@@ -91,3 +92,4 @@ obj-$(CONFIG_SERIAL_MRST_MAX3110)     += mrst_max3110.o
 obj-$(CONFIG_SERIAL_MFD_HSU)   += mfd.o
 obj-$(CONFIG_SERIAL_IFX6X60)   += ifx6x60.o
 obj-$(CONFIG_SERIAL_PCH_UART)  += pch_uart.o
+obj-$(CONFIG_SERIAL_MSM_SMD)   += msm_smd_tty.o