diff options
| author | Tony Lindgren <tony@atomide.com> | 2015-06-10 08:37:31 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2015-06-10 08:37:31 +0200 |
| commit | 63e63a1981c7247fea41ce97b3144befc8f2fb7b (patch) | |
| tree | 74a5708579661a741b6c62096530e68aee949273 /drivers/tty/serial/Makefile | |
| parent | mmc: omap_hsmmc: Change wake-up interrupt to use generic wakeirq (diff) | |
| parent | serial: 8250_omap: Move wake-up interrupt to generic wakeirq (diff) | |
| download | linux-63e63a1981c7247fea41ce97b3144befc8f2fb7b.tar.xz linux-63e63a1981c7247fea41ce97b3144befc8f2fb7b.zip | |
Merge branch 'wakeirq-8250' into omap-for-v4.2/wakeirq-v2
Diffstat (limited to 'drivers/tty/serial/Makefile')
| -rw-r--r-- | drivers/tty/serial/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/tty/serial/Makefile b/drivers/tty/serial/Makefile index c3ac3d930b33..d296cee2e132 100644 --- a/drivers/tty/serial/Makefile +++ b/drivers/tty/serial/Makefile @@ -53,7 +53,7 @@ obj-$(CONFIG_SERIAL_SB1250_DUART) += sb1250-duart.o obj-$(CONFIG_ETRAX_SERIAL) += crisv10.o obj-$(CONFIG_SERIAL_ETRAXFS) += etraxfs-uart.o obj-$(CONFIG_SERIAL_SCCNXP) += sccnxp.o -obj-$(CONFIG_SERIAL_SC16IS7XX) += sc16is7xx.o +obj-$(CONFIG_SERIAL_SC16IS7XX_CORE) += sc16is7xx.o obj-$(CONFIG_SERIAL_JSM) += jsm/ obj-$(CONFIG_SERIAL_TXX9) += serial_txx9.o obj-$(CONFIG_SERIAL_VR41XX) += vr41xx_siu.o @@ -79,7 +79,6 @@ obj-$(CONFIG_SERIAL_ALTERA_JTAGUART) += altera_jtaguart.o obj-$(CONFIG_SERIAL_VT8500) += vt8500_serial.o obj-$(CONFIG_SERIAL_IFX6X60) += ifx6x60.o obj-$(CONFIG_SERIAL_PCH_UART) += pch_uart.o -obj-$(CONFIG_SERIAL_MSM_SMD) += msm_smd_tty.o obj-$(CONFIG_SERIAL_MXS_AUART) += mxs-auart.o obj-$(CONFIG_SERIAL_LANTIQ) += lantiq.o obj-$(CONFIG_SERIAL_XILINX_PS_UART) += xilinx_uartps.o |