[TCP]: Avoid clearing sacktag hint in trivial situations

[safe/jmp/linux-2.6] / drivers / serial / Kconfig

diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index cab42cb..81b52b7 100644 (file)
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -88,21 +88,17 @@ config SERIAL_8250_PCI
        depends on SERIAL_8250 && PCI
        default SERIAL_8250
        help
-         Say Y here if you have PCI serial ports.
-
-         To compile this driver as a module, choose M here: the module
-         will be called 8250_pci.
+         This builds standard PCI serial support. You may be able to
+         disable this feature if you only need legacy serial support.
+         Saves about 9K.
 
 config SERIAL_8250_PNP
        tristate "8250/16550 PNP device support" if EMBEDDED
        depends on SERIAL_8250 && PNP
        default SERIAL_8250
        help
-         Say Y here if you have serial ports described by PNPBIOS or ACPI.
-         These are typically ports built into the system board.
-
-         To compile this driver as a module, choose M here: the module
-         will be called 8250_pnp.
+         This builds standard PNP serial support. You may be able to
+         disable this feature if you only need legacy serial support.
 
 config SERIAL_8250_HP300
        tristate
@@ -338,6 +334,34 @@ config SERIAL_AMBA_PL011_CONSOLE
          your boot loader (lilo or loadlin) about how to pass options to the
          kernel at boot time.)
 
+config SERIAL_SB1250_DUART
+       tristate "BCM1xxx on-chip DUART serial support"
+       depends on SIBYTE_SB1xxx_SOC=y
+       select SERIAL_CORE
+       default y
+       ---help---
+         Support for the asynchronous serial interface (DUART) included in
+         the BCM1250 and derived System-On-a-Chip (SOC) devices.  Note that
+         the letter D in DUART stands for "dual", which is how the device
+         is implemented.  Depending on the SOC configuration there may be
+         one or more DUARTs available of which all are handled.
+
+         If unsure, say Y.  To compile this driver as a module, choose M here:
+         the module will be called sb1250-duart.
+
+config SERIAL_SB1250_DUART_CONSOLE
+       bool "Support for console on a BCM1xxx DUART serial port"
+       depends on SERIAL_SB1250_DUART=y
+       select SERIAL_CORE_CONSOLE
+       default y
+       ---help---
+         If you say Y here, it will be possible to use a serial port 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).
+
+         If unsure, say Y.
+
 config SERIAL_ATMEL
        bool "AT91 / AT32 on-chip serial port support"
        depends on (ARM && ARCH_AT91) || AVR32
@@ -458,6 +482,36 @@ config SERIAL_DZ_CONSOLE
 
          If unsure, say Y.
 
+config SERIAL_ZS
+       tristate "DECstation Z85C30 serial support"
+       depends on MACH_DECSTATION
+       select SERIAL_CORE
+       default y
+       ---help---
+         Support for the Zilog 85C350 serial communications controller used
+         for serial ports in newer DECstation systems.  These include the
+         DECsystem 5900 and all models of the DECstation and DECsystem 5000
+         systems except from model 200.
+
+         If unsure, say Y.  To compile this driver as a module, choose M here:
+         the module will be called zs.
+
+config SERIAL_ZS_CONSOLE
+       bool "Support for console on a DECstation Z85C30 serial port"
+       depends on SERIAL_ZS=y
+       select SERIAL_CORE_CONSOLE
+       default y
+       ---help---
+         If you say Y here, it will be possible to use a serial port 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).
+
+         Note that the firmware uses ttyS1 as the serial console on the
+         Maxine and ttyS3 on the others using this driver.
+
+         If unsure, say Y.
+
 config SERIAL_21285
        tristate "DC21285 serial port support"
        depends on ARM && FOOTBRIDGE
@@ -557,7 +611,7 @@ config SERIAL_BFIN
 
 config SERIAL_BFIN_CONSOLE
        bool "Console on Blackfin serial port"
-       depends on SERIAL_BFIN
+       depends on SERIAL_BFIN=y
        select SERIAL_CORE_CONSOLE
 
 choice
@@ -778,10 +832,10 @@ config SERIAL_MUX
            4. Change the kernel command console parameter to: console=ttyB0
 
 config SERIAL_MUX_CONSOLE
-        bool "Support for console on serial MUX"
-        depends on SERIAL_MUX
+       bool "Support for console on serial MUX"
+       depends on SERIAL_MUX=y
        select SERIAL_CORE_CONSOLE
-        default y
+       default y
 
 config PDC_CONSOLE
        bool "PDC software console support"
@@ -1137,7 +1191,7 @@ config SERIAL_VR41XX
 
 config SERIAL_VR41XX_CONSOLE
        bool "Enable NEC VR4100 series Serial Interface Unit console"
-       depends on SERIAL_VR41XX
+       depends on SERIAL_VR41XX=y
        select SERIAL_CORE_CONSOLE
        help
          If you have a NEC VR4100 series processor and you want to use