Skip to content

Commit

Permalink
Merge tag 'tty-5.3-rc2' of git://git.kernel.org/pub/scm/linux/kernel/…
Browse files Browse the repository at this point in the history
…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
  • Loading branch information
Linus Torvalds committed Jul 28, 2019
2 parents ad28fd1 + 61d5145 commit 572782b
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 757 deletions.
19 changes: 0 additions & 19 deletions drivers/tty/serial/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -1035,25 +1035,6 @@ config SERIAL_VT8500_CONSOLE
depends on SERIAL_VT8500=y
select SERIAL_CORE_CONSOLE

config SERIAL_NETX
tristate "NetX serial port support"
depends on ARCH_NETX
select SERIAL_CORE
help
If you have a machine based on a Hilscher NetX SoC you
can enable its onboard serial port by enabling this option.

To compile this driver as a module, choose M here: the
module will be called netx-serial.

config SERIAL_NETX_CONSOLE
bool "Console on NetX serial port"
depends on SERIAL_NETX=y
select SERIAL_CORE_CONSOLE
help
If you have enabled the serial port on the Hilscher NetX SoC
you can make it the console by answering Y to this option.

config SERIAL_OMAP
tristate "OMAP serial port support"
depends on ARCH_OMAP2PLUS
Expand Down
1 change: 0 additions & 1 deletion drivers/tty/serial/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading

0 comments on commit 572782b

Please sign in to comment.