Commit b9e42b3c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'tty-5.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty 

Pull serial driver fix from Greg KH:
 "Here is a single 8250 Kconfig fix for 5.15-rc6 that resolves a
  regression that showed up in 5.15-rc1. It has been in linux-next for a
  while with no reported issues"

* tag 'tty-5.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
  serial: 8250: allow disabling of Freescale 16550 compile test
parents ebf613ae cb228221

drivers/tty/serial/8250/Kconfig

+6 −2
Original line number Diff line number Diff line
@@ -361,9 +361,13 @@ config SERIAL_8250_BCM2835AUX 
	  If unsure, say N.



config SERIAL_8250_FSL

	bool

	bool "Freescale 16550 UART support" if COMPILE_TEST && !(PPC || ARM || ARM64)

	depends on SERIAL_8250_CONSOLE

	default PPC || ARM || ARM64 || COMPILE_TEST

	default PPC || ARM || ARM64

	help

	  Selecting this option enables a workaround for a break-detection

	  erratum for Freescale 16550 UARTs in the 8250 driver. It also

	  enables support for ACPI enumeration.



config SERIAL_8250_DW

	tristate "Support for Synopsys DesignWare 8250 quirks"