diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-28 20:18:33 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-28 20:18:33 +0300 |
| commit | 572782b213b284e05cbbe941a18df055d8d1d898 (patch) | |
| tree | d86162a49c5b48833c9c5fc1b976f627bbf514e7 /drivers/tty/serial/Makefile | |
| parent | ad28fd1cb2bd7d67f9240f596ea4740c95545fdf (diff) | |
| parent | 61d51456f35760a09e8aa1e6ddd247f1547015d3 (diff) | |
| download | linux-572782b213b284e05cbbe941a18df055d8d1d898.tar.xz | |
Merge tag 'tty-5.3-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
Pull tty fixes from Greg KH:
"Here are two tty/vt fixes:
- delete the netx-serial driver as the arch has been removed, no need
to keep the serial driver for it around either.
- vt console_lock fix to resolve a reported noisy warning at runtime
Both of these have been in linux-next with no reported issues"
* tag 'tty-5.3-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
vt: Grab console_lock around con_is_bound in show_bind
tty: serial: netx: Delete driver
Diffstat (limited to 'drivers/tty/serial/Makefile')
| -rw-r--r-- | drivers/tty/serial/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/tty/serial/Makefile b/drivers/tty/serial/Makefile index 7cd7cabfa6c4..15a0fccadf7e 100644 --- a/drivers/tty/serial/Makefile +++ b/drivers/tty/serial/Makefile @@ -59,7 +59,6 @@ obj-$(CONFIG_SERIAL_ATMEL) += atmel_serial.o obj-$(CONFIG_SERIAL_UARTLITE) += uartlite.o obj-$(CONFIG_SERIAL_MSM) += msm_serial.o obj-$(CONFIG_SERIAL_QCOM_GENI) += qcom_geni_serial.o -obj-$(CONFIG_SERIAL_NETX) += netx-serial.o obj-$(CONFIG_SERIAL_KS8695) += serial_ks8695.o obj-$(CONFIG_SERIAL_OMAP) += omap-serial.o obj-$(CONFIG_SERIAL_ALTERA_UART) += altera_uart.o |