vserver 1.9.3

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

diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 74a0b9c..6f8984a 100644 (file)
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -450,7 +450,7 @@ config SERIAL_MUX_CONSOLE
 
 config PDC_CONSOLE
        bool "PDC software console support"
 
 config PDC_CONSOLE
        bool "PDC software console support"

-       depends on PARISC && !SERIAL_MUX
+       depends on PARISC && !SERIAL_MUX && VT

        default n
        help
          Saying Y here will enable the software based PDC console to be 
        default n
        help
          Saying Y here will enable the software based PDC console to be 


@@ -682,6 +682,7 @@ config SERIAL_SGI_L1_CONSOLE
        bool "SGI Altix L1 serial console support"
        depends on IA64_GENERIC || IA64_SGI_SN2
        select SERIAL_CORE
        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!),
        help
                If you have an SGI Altix and you would like to use the system
                controller serial port as your console (you want this!),


@@ -714,4 +715,16 @@ config SERIAL_MPC52xx_CONSOLE_BAUD
          This value is only used if the bootloader doesn't pass in the
          console baudrate
 
          This value is only used if the bootloader doesn't pass in the
          console baudrate
 

+config SERIAL_ICOM
+       tristate "IBM Multiport Serial Adapter"
+       depends on PPC_ISERIES || PPC_PSERIES
+       select SERIAL_CORE
+       help
+         This driver is for a family of multiport serial adapters
+         including 2 port RVX, 2 port internal modem, 4 port internal
+         modem and a split 1 port RVX and 1 port internal modem.
+
+         This driver can also be built as a module.  If so, the module
+         will be called icom.
+

 endmenu
 endmenu