Merge 5.10-rc3 into tty-next

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

diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index 28f22e58639c6c18c17c1a0f9af03da40b600b41..8788e504ffb5ca3e9fcbbf10397cd5ec5557a7bd 100644 (file)
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -704,22 +704,6 @@ config SERIAL_SH_SCI_DMA
        depends on SERIAL_SH_SCI && DMA_ENGINE
        default ARCH_RENESAS
 
-config SERIAL_PNX8XXX
-       bool "Enable PNX8XXX SoCs' UART Support"
-       depends on SOC_PNX833X
-       select SERIAL_CORE
-       help
-         If you have a MIPS-based Philips SoC such as PNX8330 and you want
-         to use serial ports, say Y.  Otherwise, say N.
-
-config SERIAL_PNX8XXX_CONSOLE
-       bool "Enable PNX8XX0 serial console"
-       depends on SERIAL_PNX8XXX
-       select SERIAL_CORE_CONSOLE
-       help
-         If you have a MIPS-based Philips SoC such as PNX8330 and you want
-         to use serial console, say Y. Otherwise, say N.
-
 config SERIAL_HS_LPC32XX
        tristate "LPC32XX high speed serial port support"
        depends on ARCH_LPC32XX || COMPILE_TEST