Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[linux-2.6-block.git] / drivers / tty / serial / Kconfig

diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index 2c86d196fb3ba81c8850254c14896bc6db5adcd4..fd385c8c53a52192d9141ad57270c87be10fed62 100644 (file)
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -457,20 +457,6 @@ config SERIAL_21285_CONSOLE
          your boot loader (lilo or loadlin) about how to pass options to the
          kernel at boot time.)
 
-config SERIAL_MPSC
-       bool "Marvell MPSC serial port support"
-       depends on MV64X60
-       select SERIAL_CORE
-       help
-         Say Y here if you want to use the Marvell MPSC serial controller.
-
-config SERIAL_MPSC_CONSOLE
-       bool "Support for console on Marvell MPSC serial port"
-       depends on SERIAL_MPSC
-       select SERIAL_CORE_CONSOLE
-       help
-         Say Y here if you want to support a serial console on a Marvell MPSC.
-
 config SERIAL_PXA
        bool "PXA serial port support (DEPRECATED)"
        depends on ARCH_PXA || ARCH_MMP
@@ -515,7 +501,7 @@ config SERIAL_SA1100
        help
          If you have a machine based on a SA1100/SA1110 StrongARM(R) CPU you
          can enable its onboard serial port by enabling this option.
-         Please read <file:Documentation/arm/SA1100/serial_UART> for further
+         Please read <file:Documentation/arm/sa1100/serial_uart.rst> for further
          info.
 
 config SERIAL_SA1100_CONSOLE