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

[sfrench/cifs-2.6.git] / drivers / tty / serial / Kconfig

diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index 514169eb1859027fe175994780a03c7d2d320404..4789b5d62f6379cf7709295089ece2a2ac79cc86 100644 (file)
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -197,23 +197,6 @@ config SERIAL_KGDB_NMI
 
          If unsure, say N.
 
-config SERIAL_KS8695
-       bool "Micrel KS8695 (Centaur) serial port support"
-       depends on ARCH_KS8695
-       select SERIAL_CORE
-       help
-         This selects the Micrel Centaur KS8695 UART.  Say Y here.
-
-config SERIAL_KS8695_CONSOLE
-       bool "Support for console on KS8695 (Centaur) serial port"
-       depends on SERIAL_KS8695=y
-       select SERIAL_CORE_CONSOLE
-       help
-         Say Y here if you wish to use a KS8695 (Centaur) UART as the
-         system console (the system console is the device which
-         receives all kernel messages and warnings and which allows
-         logins in single user mode).
-
 config SERIAL_MESON
        tristate "Meson serial port support"
        depends on ARCH_MESON
@@ -1407,6 +1390,22 @@ config SERIAL_FSL_LPUART_CONSOLE
          If you have enabled the lpuart serial port on the Freescale SoCs,
          you can make it the console by answering Y to this option.
 
+config SERIAL_FSL_LINFLEXUART
+       tristate "Freescale linflexuart serial port support"
+       depends on PRINTK
+       select SERIAL_CORE
+       help
+         Support for the on-chip linflexuart on some Freescale SOCs.
+
+config SERIAL_FSL_LINFLEXUART_CONSOLE
+       bool "Console on Freescale linflexuart serial port"
+       depends on SERIAL_FSL_LINFLEXUART=y
+       select SERIAL_CORE_CONSOLE
+       select SERIAL_EARLYCON
+       help
+         If you have enabled the linflexuart serial port on the Freescale
+         SoCs, you can make it the console by answering Y to this option.
+
 config SERIAL_CONEXANT_DIGICOLOR
        tristate "Conexant Digicolor CX92xxx USART serial port support"
        depends on OF