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

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

diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index 518aac9..514169e 100644 (file)
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -856,16 +856,6 @@ config SERIAL_CPM_CONSOLE
          your boot loader (lilo or loadlin) about how to pass options to the
          kernel at boot time.)
 
          your boot loader (lilo or loadlin) about how to pass options to the
          kernel at boot time.)
 

-config SERIAL_SGI_L1_CONSOLE
-       bool "SGI Altix L1 serial console support"
-       depends on IA64_GENERIC || IA64_SGI_SN2
-       select SERIAL_CORE
-       select SERIAL_CORE_CONSOLE
-       help
-               If you have an SGI Altix and you would like to use the system
-               controller serial port as your console (you want this!),
-               say Y.  Otherwise, say N.
-

 config SERIAL_PIC32
        tristate "Microchip PIC32 serial support"
        depends on MACH_PIC32
 config SERIAL_PIC32
        tristate "Microchip PIC32 serial support"
        depends on MACH_PIC32


@@ -983,23 +973,6 @@ config SERIAL_JSM
          To compile this driver as a module, choose M here: the
          module will be called jsm.
 
          To compile this driver as a module, choose M here: the
          module will be called jsm.
 

-config SERIAL_SGI_IOC4
-       tristate "SGI IOC4 controller serial support"
-       depends on (IA64_GENERIC || IA64_SGI_SN2) && SGI_IOC4
-       select SERIAL_CORE
-       help
-               If you have an SGI Altix with an IOC4 based Base IO card
-               and wish to use the serial ports on this card, say Y.
-               Otherwise, say N.
-
-config SERIAL_SGI_IOC3
-       tristate "SGI Altix IOC3 serial support"
-       depends on (IA64_GENERIC || IA64_SGI_SN2) && SGI_IOC3
-       select SERIAL_CORE
-       help
-         If you have an SGI Altix with an IOC3 serial card,
-         say Y or M.  Otherwise, say N.
-

 config SERIAL_MSM
        tristate "MSM on-chip serial port support"
        depends on ARCH_QCOM
 config SERIAL_MSM
        tristate "MSM on-chip serial port support"
        depends on ARCH_QCOM