USB: fix ratelimit call semantics

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

diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index d0a10fa..315ea99 100644 (file)
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -5,6 +5,7 @@
 #
 
 menu "Serial drivers"
 #
 
 menu "Serial drivers"

+       depends on HAS_IOMEM

 
 #
 # The new 8250/16550 serial drivers
 
 #
 # The new 8250/16550 serial drivers


@@ -63,6 +64,37 @@ config SERIAL_8250_CONSOLE
 
          If unsure, say N.
 
 
          If unsure, say N.
 

+config SERIAL_8250_GSC
+       tristate
+       depends on SERIAL_8250 && GSC
+       default SERIAL_8250
+
+config SERIAL_8250_PCI
+       tristate "8250/16550 PCI device support" if EMBEDDED
+       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.
+
+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.
+
+config SERIAL_8250_HP300
+       tristate
+       depends on SERIAL_8250 && HP300
+       default SERIAL_8250
+

 config SERIAL_8250_CS
        tristate "8250/16550 PCMCIA device support"
        depends on PCMCIA && SERIAL_8250
 config SERIAL_8250_CS
        tristate "8250/16550 PCMCIA device support"
        depends on PCMCIA && SERIAL_8250


@@ -77,14 +109,6 @@ config SERIAL_8250_CS
 
          If unsure, say N.
 
 
          If unsure, say N.
 

-config SERIAL_8250_ACPI
-       bool "8250/16550 device discovery via ACPI namespace"
-       default y if IA64
-       depends on ACPI && SERIAL_8250
-       ---help---
-         If you wish to enable serial port discovery via the ACPI
-         namespace, say Y here.  If unsure, say N.
-

 config SERIAL_8250_NR_UARTS
        int "Maximum number of 8250/16550 serial ports"
        depends on SERIAL_8250
 config SERIAL_8250_NR_UARTS
        int "Maximum number of 8250/16550 serial ports"
        depends on SERIAL_8250


@@ -102,7 +126,7 @@ config SERIAL_8250_RUNTIME_UARTS
        default "4"
        help
          Set this to the maximum number of serial ports you want
        default "4"
        help
          Set this to the maximum number of serial ports you want

-         the kernel to register at boot time.  This can be overriden
+         the kernel to register at boot time.  This can be overridden

          with the module parameter "nr_uarts", or boot-time parameter
          8250.nr_uarts
 
          with the module parameter "nr_uarts", or boot-time parameter
          8250.nr_uarts
 


@@ -132,32 +156,6 @@ config SERIAL_8250_MANY_PORTS
          say N here to save some memory. You can also say Y if you have an
          "intelligent" multiport card such as Cyclades, Digiboards, etc.
 
          say N here to save some memory. You can also say Y if you have an
          "intelligent" multiport card such as Cyclades, Digiboards, etc.
 

-config SERIAL_8250_SHARE_IRQ
-       bool "Support for sharing serial interrupts"
-       depends on SERIAL_8250_EXTENDED
-       help
-         Some serial boards have hardware support which allows multiple dumb
-         serial ports on the same board to share a single IRQ. To enable
-         support for this in the serial driver, say Y here.
-
-config SERIAL_8250_DETECT_IRQ
-       bool "Autodetect IRQ on standard ports (unsafe)"
-       depends on SERIAL_8250_EXTENDED
-       help
-         Say Y here if you want the kernel to try to guess which IRQ
-         to use for your serial port.
-
-         This is considered unsafe; it is far better to configure the IRQ in
-         a boot script using the setserial command.
-
-         If unsure, say N.
-
-config SERIAL_8250_RSA
-       bool "Support RSA serial ports"
-       depends on SERIAL_8250_EXTENDED
-       help
-         ::: To be written :::
-

 #
 # Multi-port serial cards
 #
 #
 # Multi-port serial cards
 #


@@ -180,17 +178,27 @@ config SERIAL_8250_ACCENT
          To compile this driver as a module, choose M here: the module
          will be called 8250_accent.
 
          To compile this driver as a module, choose M here: the module
          will be called 8250_accent.
 

-

 config SERIAL_8250_BOCA
        tristate "Support Boca cards"
        depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS
        help
          Say Y here if you have a Boca serial board.  Please read the Boca
 config SERIAL_8250_BOCA
        tristate "Support Boca cards"
        depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS
        help
          Say Y here if you have a Boca serial board.  Please read the Boca

-         mini-HOWTO, avaialble from <http://www.tldp.org/docs.html#howto>
+         mini-HOWTO, available from <http://www.tldp.org/docs.html#howto>

 
          To compile this driver as a module, choose M here: the module
          will be called 8250_boca.
 
 
          To compile this driver as a module, choose M here: the module
          will be called 8250_boca.
 

+config SERIAL_8250_EXAR_ST16C554
+       tristate "Support Exar ST16C554/554D Quad UART"
+       depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS
+       help
+         The Uplogix Envoy TU301 uses this Exar Quad UART.  If you are
+         tinkering with your Envoy TU301, or have a machine with this UART,
+         say Y here.
+
+         To compile this driver as a module, choose M here: the module
+         will be called 8250_exar_st16c554.
+

 config SERIAL_8250_HUB6
        tristate "Support Hub6 cards"
        depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS
 config SERIAL_8250_HUB6
        tristate "Support Hub6 cards"
        depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS


@@ -200,6 +208,32 @@ config SERIAL_8250_HUB6
          To compile this driver as a module, choose M here: the module
          will be called 8250_hub6.
 
          To compile this driver as a module, choose M here: the module
          will be called 8250_hub6.
 

+config SERIAL_8250_SHARE_IRQ
+       bool "Support for sharing serial interrupts"
+       depends on SERIAL_8250_EXTENDED
+       help
+         Some serial boards have hardware support which allows multiple dumb
+         serial ports on the same board to share a single IRQ. To enable
+         support for this in the serial driver, say Y here.
+
+config SERIAL_8250_DETECT_IRQ
+       bool "Autodetect IRQ on standard ports (unsafe)"
+       depends on SERIAL_8250_EXTENDED
+       help
+         Say Y here if you want the kernel to try to guess which IRQ
+         to use for your serial port.
+
+         This is considered unsafe; it is far better to configure the IRQ in
+         a boot script using the setserial command.
+
+         If unsure, say N.
+
+config SERIAL_8250_RSA
+       bool "Support RSA serial ports"
+       depends on SERIAL_8250_EXTENDED
+       help
+         ::: To be written :::
+

 config SERIAL_8250_MCA
        tristate "Support 8250-type ports on MCA buses"
        depends on SERIAL_8250 != n && MCA
 config SERIAL_8250_MCA
        tristate "Support 8250-type ports on MCA buses"
        depends on SERIAL_8250 != n && MCA


@@ -225,6 +259,15 @@ config SERIAL_8250_AU1X00
          to this option.  The driver can handle 1 or 2 serial ports.
          If unsure, say N.
 
          to this option.  The driver can handle 1 or 2 serial ports.
          If unsure, say N.
 

+config SERIAL_8250_RM9K
+       bool "Support for MIPS RM9xxx integrated serial port"
+       depends on SERIAL_8250 != n && SERIAL_RM9000
+       select SERIAL_8250_SHARE_IRQ
+       help
+         Selecting this option will add support for the integrated serial
+         port hardware found on MIPS RM9122 and similar processors.
+         If unsure, say N.
+

 comment "Non-8250 serial port support"
 
 config SERIAL_AMBA_PL010
 comment "Non-8250 serial port support"
 
 config SERIAL_AMBA_PL010


@@ -233,7 +276,8 @@ config SERIAL_AMBA_PL010
        select SERIAL_CORE
        help
          This selects the ARM(R) AMBA(R) PrimeCell PL010 UART.  If you have
        select SERIAL_CORE
        help
          This selects the ARM(R) AMBA(R) PrimeCell PL010 UART.  If you have

-         an Integrator/AP or Integrator/PP2 platform, say Y or M here.
+         an Integrator/AP or Integrator/PP2 platform, or if you have a
+         Cirrus Logic EP93xx CPU, say Y or M here.

 
          If unsure, say N.
 
 
          If unsure, say N.
 


@@ -276,36 +320,37 @@ config SERIAL_AMBA_PL011_CONSOLE
          Even if you say Y here, the currently visible framebuffer console
          (/dev/tty0) will still be used as the system console by default, but
          you can alter that using a kernel command line option such as
          Even if you say Y here, the currently visible framebuffer console
          (/dev/tty0) will still be used as the system console by default, but
          you can alter that using a kernel command line option such as

-         "console=ttyAM0". (Try "man bootparam" or see the documentation of
+         "console=ttyAMA0". (Try "man bootparam" or see the documentation of

          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_AT91
-       bool "AT91RM9200 serial port support"
-       depends on ARM && ARCH_AT91RM9200
+config SERIAL_ATMEL
+       bool "AT91 / AT32 on-chip serial port support"
+       depends on (ARM && ARCH_AT91) || AVR32

        select SERIAL_CORE
        help
        select SERIAL_CORE
        help

-         This enables the driver for the on-chip UARTs of the AT91RM9200
-         processor.
+         This enables the driver for the on-chip UARTs of the Atmel
+         AT91 and AT32 processors.

 
 

-config SERIAL_AT91_CONSOLE
-       bool "Support for console on AT91RM9200 serial port"
-       depends on SERIAL_AT91=y
+config SERIAL_ATMEL_CONSOLE
+       bool "Support for console on AT91 / AT32 serial port"
+       depends on SERIAL_ATMEL=y

        select SERIAL_CORE_CONSOLE
        help
        select SERIAL_CORE_CONSOLE
        help

-         Say Y here if you wish to use a UART on the AT91RM9200 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).
+         Say Y here if you wish to use an on-chip UART on a Atmel
+         AT91 or AT32 processor 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).

 
 

-config SERIAL_AT91_TTYAT
-       bool "Install as device ttyAT0-4 instead of ttyS0-4"
-       depends on SERIAL_AT91=y
+config SERIAL_ATMEL_TTYAT
+       bool "Install as device ttyATn instead of ttySn"
+       depends on SERIAL_ATMEL=y

        help
        help

-         Say Y here if you wish to have the five internal AT91RM9200 UARTs
-         appear as /dev/ttyAT0-4 (major 204, minor 154-158) instead of the
-         normal /dev/ttyS0-4 (major 4, minor 64-68). This is necessary if
-         you also want other UARTs, such as external 8250/16C550 compatible
-         UARTs.
+         Say Y here if you wish to have the internal AT91 / AT32 UARTs
+         appear as /dev/ttyATn (major 204, minor starting at 154)
+         instead of the normal /dev/ttySn (major 4, minor starting at
+         64). This is necessary if you also want other UARTs, such as
+         external 8250/16C550 compatible UARTs.

          The ttySn nodes are legally reserved for the 8250 serial driver
          but are often misused by other serial drivers.
 
          The ttySn nodes are legally reserved for the 8250 serial driver
          but are often misused by other serial drivers.
 


@@ -314,6 +359,23 @@ config SERIAL_AT91_TTYAT
 
          Say Y if you have an external 8250/16C550 UART.  If unsure, say N.
 
 
          Say Y if you have an external 8250/16C550 UART.  If unsure, say N.
 

+config SERIAL_KS8695
+       bool "Micrel KS8695 (Centaur) serial port support"
+       depends on ARCH_KS8695
+       select SERIAL_CORE
+       help
+         This selects the Micrel Centaur KS8695 UART.  Say Y here.
+
+config SERIAL_KS8695_CONSOLE
+       bool "Support for console on KS8695 (Centaur) serial port"
+       depends on SERIAL_KS8695=y
+       select SERIAL_CORE_CONSOLE
+       help
+         Say Y here if you wish to use a KS8695 (Centaur) UART 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).
+

 config SERIAL_CLPS711X
        tristate "CLPS711X serial port support"
        depends on ARM && ARCH_CLPS711X
 config SERIAL_CLPS711X
        tristate "CLPS711X serial port support"
        depends on ARM && ARCH_CLPS711X


@@ -334,21 +396,24 @@ config SERIAL_CLPS711X_CONSOLE
          kernel at boot time.)
 
 config SERIAL_S3C2410
          kernel at boot time.)
 
 config SERIAL_S3C2410

-       tristate "Samsung S3C2410 Serial port support"
+       tristate "Samsung S3C2410/S3C2440/S3C2442/S3C2412 Serial port support"

        depends on ARM && ARCH_S3C2410
        select SERIAL_CORE
        help
        depends on ARM && ARCH_S3C2410
        select SERIAL_CORE
        help

-         Support for the on-chip UARTs on the Samsung S3C2410X CPU,
+         Support for the on-chip UARTs on the Samsung S3C24XX series CPUs,

          providing /dev/ttySAC0, 1 and 2 (note, some machines may not
          provide all of these ports, depending on how the serial port
          pins are configured.
 
          providing /dev/ttySAC0, 1 and 2 (note, some machines may not
          provide all of these ports, depending on how the serial port
          pins are configured.
 

+         Currently this driver supports the UARTS on the S3C2410, S3C2440,
+         S3C2442, S3C2412 and S3C2413 CPUs.
+

 config SERIAL_S3C2410_CONSOLE
        bool "Support for console on S3C2410 serial port"
        depends on SERIAL_S3C2410=y
        select SERIAL_CORE_CONSOLE
        help
 config SERIAL_S3C2410_CONSOLE
        bool "Support for console on S3C2410 serial port"
        depends on SERIAL_S3C2410=y
        select SERIAL_CORE_CONSOLE
        help

-         Allow selection of the S3C2410 on-board serial ports for use as
+         Allow selection of the S3C24XX on-board serial ports for use as

          an virtual console.
 
          Even if you say Y here, the currently visible virtual console
          an virtual console.
 
          Even if you say Y here, the currently visible virtual console


@@ -465,6 +530,100 @@ config SERIAL_SA1100_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_BFIN
+       tristate "Blackfin serial port support"
+       depends on BFIN
+       select SERIAL_CORE
+       select SERIAL_BFIN_UART0 if (BF531 || BF532 || BF533 || BF561)
+       help
+         Add support for the built-in UARTs on the Blackfin.
+
+         To compile this driver as a module, choose M here: the
+         module will be called bfin_5xx.
+
+config SERIAL_BFIN_CONSOLE
+       bool "Console on Blackfin serial port"
+       depends on SERIAL_BFIN
+       select SERIAL_CORE_CONSOLE
+
+choice
+       prompt "UART Mode"
+       depends on SERIAL_BFIN
+       default SERIAL_BFIN_DMA
+       help
+         This driver supports the built-in serial ports of the Blackfin family
+         of CPUs
+
+config SERIAL_BFIN_DMA
+       bool "DMA mode"
+       depends on DMA_UNCACHED_1M
+       help
+         This driver works under DMA mode. If this option is selected, the
+         blackfin simple dma driver is also enabled.
+
+config SERIAL_BFIN_PIO
+       bool "PIO mode"
+       help
+         This driver works under PIO mode.
+
+endchoice
+
+config SERIAL_BFIN_UART0
+       bool "Enable UART0"
+       depends on SERIAL_BFIN
+       help
+         Enable UART0
+
+config BFIN_UART0_CTSRTS
+       bool "Enable UART0 hardware flow control"
+       depends on SERIAL_BFIN_UART0
+       help
+         Enable hardware flow control in the driver. Using GPIO emulate the CTS/RTS
+         signal.
+
+config UART0_CTS_PIN
+       int "UART0 CTS pin"
+       depends on BFIN_UART0_CTSRTS
+       default 23
+       help
+         The default pin is GPIO_GP7.
+         Refer to ./include/asm-blackfin/gpio.h to see the GPIO map.
+
+config UART0_RTS_PIN
+       int "UART0 RTS pin"
+       depends on BFIN_UART0_CTSRTS
+       default 22
+       help
+         The default pin is GPIO_GP6.
+         Refer to ./include/asm-blackfin/gpio.h to see the GPIO map.
+
+config SERIAL_BFIN_UART1
+       bool "Enable UART1"
+       depends on SERIAL_BFIN && (BF534 || BF536 || BF537)
+       help
+         Enable UART1
+
+config BFIN_UART1_CTSRTS
+       bool "Enable UART1 hardware flow control"
+       depends on SERIAL_BFIN_UART1
+       help
+         Enable hardware flow control in the driver. Using GPIO emulate the CTS/RTS
+         signal.
+
+config UART1_CTS_PIN
+       int "UART1 CTS pin"
+       depends on BFIN_UART1_CTSRTS
+       default -1
+       help
+         Refer to ./include/asm-blackfin/gpio.h to see the GPIO map.
+
+config UART1_RTS_PIN
+       int "UART1 RTS pin"
+       depends on BFIN_UART1_CTSRTS
+       default -1
+       help
+         Refer to ./include/asm-blackfin/gpio.h to see the GPIO map.
+

 config SERIAL_IMX
        bool "IMX serial port support"
        depends on ARM && ARCH_IMX
 config SERIAL_IMX
        bool "IMX serial port support"
        depends on ARM && ARCH_IMX


@@ -488,6 +647,25 @@ config SERIAL_IMX_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_UARTLITE
+       tristate "Xilinx uartlite serial port support"
+       depends on PPC32
+       select SERIAL_CORE
+       help
+         Say Y here if you want to use the Xilinx uartlite serial controller.
+
+         To compile this driver as a module, choose M here: the
+         module will be called uartlite.ko.
+
+config SERIAL_UARTLITE_CONSOLE
+       bool "Support for console on Xilinx uartlite serial port"
+       depends on SERIAL_UARTLITE=y
+       select SERIAL_CORE_CONSOLE
+       help
+         Say Y here if you wish to use a Xilinx uartlite 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).
+

 config SERIAL_SUNCORE
        bool
        depends on SPARC
 config SERIAL_SUNCORE
        bool
        depends on SPARC


@@ -533,10 +711,11 @@ config SERIAL_MUX
        default y
        ---help---
          Saying Y here will enable the hardware MUX serial driver for
        default y
        ---help---
          Saying Y here will enable the hardware MUX serial driver for

-         the Nova and K class systems.  The hardware MUX is not 8250/16550 
-         compatible therefore the /dev/ttyB0 device is shared between the 
-         Serial MUX and the PDC software console.  The following steps 
-         need to be completed to use the Serial MUX:
+         the Nova, K class systems and D class with a 'remote control card'.
+         The hardware MUX is not 8250/16550 compatible therefore the
+         /dev/ttyB0 device is shared between the Serial MUX and the PDC
+         software console. The following steps need to be completed to use
+         the Serial MUX:

 
            1. create the device entry (mknod /dev/ttyB0 c 11 0)
            2. Edit the /etc/inittab to start a getty listening on /dev/ttyB0
 
            1. create the device entry (mknod /dev/ttyB0 c 11 0)
            2. Edit the /etc/inittab to start a getty listening on /dev/ttyB0


@@ -610,7 +789,7 @@ config V850E_UART
 
 config V850E_UARTB
         bool
 
 config V850E_UARTB
         bool

-       depends V850E_UART && V850E_ME2
+       depends on V850E_UART && V850E_ME2

        default y
 
 config V850E_UART_CONSOLE
        default y
 
 config V850E_UART_CONSOLE


@@ -619,30 +798,35 @@ config V850E_UART_CONSOLE
        select SERIAL_CORE_CONSOLE
 
 config SERIAL_SH_SCI
        select SERIAL_CORE_CONSOLE
 
 config SERIAL_SH_SCI

-       tristate "SH SCI(F) serial port support"
+       tristate "SuperH SCI(F) serial port support"

        depends on SUPERH || H8300
        select SERIAL_CORE
 
        depends on SUPERH || H8300
        select SERIAL_CORE
 

+config SERIAL_SH_SCI_NR_UARTS
+       int "Maximum number of SCI(F) serial ports"
+       depends on SERIAL_SH_SCI
+       default "2"
+

 config SERIAL_SH_SCI_CONSOLE
 config SERIAL_SH_SCI_CONSOLE

-       bool "Support for console on SH SCI(F)"
+       bool "Support for console on SuperH SCI(F)"

        depends on SERIAL_SH_SCI=y
        select SERIAL_CORE_CONSOLE
 
        depends on SERIAL_SH_SCI=y
        select SERIAL_CORE_CONSOLE
 

-config SERIAL_AU1X00
-       bool "Enable Au1x00 UART Support"
-       depends on MIPS && SOC_AU1X00
+config SERIAL_PNX8XXX
+       bool "Enable PNX8XXX SoCs' UART Support"
+       depends on MIPS && SOC_PNX8550

        select SERIAL_CORE
        help
        select SERIAL_CORE
        help

-         If you have an Alchemy AU1X00 processor (MIPS based) and you want
-         to use serial ports, say Y.  Otherwise, say N.
+         If you have a MIPS-based Philips SoC such as PNX8550 or PNX8330
+         and you want to use serial ports, say Y.  Otherwise, say N.

 
 

-config SERIAL_AU1X00_CONSOLE
-       bool "Enable Au1x00 serial console"
-       depends on SERIAL_AU1X00
+config SERIAL_PNX8XXX_CONSOLE
+       bool "Enable PNX8XX0 serial console"
+       depends on SERIAL_PNX8XXX

        select SERIAL_CORE_CONSOLE
        help
        select SERIAL_CORE_CONSOLE
        help

-         If you have an Alchemy AU1X00 processor (MIPS based) and you want
-         to use a console on a serial port, say Y.  Otherwise, say N.
+         If you have a MIPS-based Philips SoC such as PNX8550 or PNX8330
+         and you want to use serial console, say Y. Otherwise, say N.

 
 config SERIAL_CORE
        tristate
 
 config SERIAL_CORE
        tristate


@@ -655,7 +839,7 @@ config SERIAL_68328
        depends on M68328 || M68EZ328 || M68VZ328
        help
          This driver supports the built-in serial port of the Motorola 68328
        depends on M68328 || M68EZ328 || M68VZ328
        help
          This driver supports the built-in serial port of the Motorola 68328

-         (standard, EZ and VZ varities).
+         (standard, EZ and VZ varieties).

 
 config SERIAL_68328_RTS_CTS
        bool "Support RTS/CTS on 68328 serial port"
 
 config SERIAL_68328_RTS_CTS
        bool "Support RTS/CTS on 68328 serial port"


@@ -754,37 +938,37 @@ config SERIAL_CPM_SCC1
        bool "Support for SCC1 serial port"
        depends on SERIAL_CPM=y
        help
        bool "Support for SCC1 serial port"
        depends on SERIAL_CPM=y
        help

-         Select the is option to use SCC1 as a serial port
+         Select this option to use SCC1 as a serial port

 
 config SERIAL_CPM_SCC2
        bool "Support for SCC2 serial port"
        depends on SERIAL_CPM=y
        help
 
 config SERIAL_CPM_SCC2
        bool "Support for SCC2 serial port"
        depends on SERIAL_CPM=y
        help

-         Select the is option to use SCC2 as a serial port
+         Select this option to use SCC2 as a serial port

 
 config SERIAL_CPM_SCC3
        bool "Support for SCC3 serial port"
        depends on SERIAL_CPM=y
        help
 
 config SERIAL_CPM_SCC3
        bool "Support for SCC3 serial port"
        depends on SERIAL_CPM=y
        help

-         Select the is option to use SCC3 as a serial port
+         Select this option to use SCC3 as a serial port

 
 config SERIAL_CPM_SCC4
        bool "Support for SCC4 serial port"
        depends on SERIAL_CPM=y
        help
 
 config SERIAL_CPM_SCC4
        bool "Support for SCC4 serial port"
        depends on SERIAL_CPM=y
        help

-         Select the is option to use SCC4 as a serial port
+         Select this option to use SCC4 as a serial port

 
 config SERIAL_CPM_SMC1
        bool "Support for SMC1 serial port"
        depends on SERIAL_CPM=y
        help
 
 config SERIAL_CPM_SMC1
        bool "Support for SMC1 serial port"
        depends on SERIAL_CPM=y
        help

-         Select the is option to use SMC1 as a serial port
+         Select this option to use SMC1 as a serial port

 
 config SERIAL_CPM_SMC2
        bool "Support for SMC2 serial port"
        depends on SERIAL_CPM=y
        help
 
 config SERIAL_CPM_SMC2
        bool "Support for SMC2 serial port"
        depends on SERIAL_CPM=y
        help

-         Select the is option to use SMC2 as a serial port
+         Select this option to use SMC2 as a serial port

 
 config SERIAL_SGI_L1_CONSOLE
        bool "SGI Altix L1 serial console support"
 
 config SERIAL_SGI_L1_CONSOLE
        bool "SGI Altix L1 serial console support"


@@ -867,13 +1051,18 @@ config SERIAL_M32R_PLDSIO
 
 config SERIAL_TXX9
        bool "TMPTX39XX/49XX SIO support"
 
 config SERIAL_TXX9
        bool "TMPTX39XX/49XX SIO support"

-       depends HAS_TXX9_SERIAL
+       depends on HAS_TXX9_SERIAL

        select SERIAL_CORE
        default y
 
 config HAS_TXX9_SERIAL
        bool
 
        select SERIAL_CORE
        default y
 
 config HAS_TXX9_SERIAL
        bool
 

+config SERIAL_TXX9_NR_UARTS
+       int "Maximum number of TMPTX39XX/49XX SIO ports"
+       depends on SERIAL_TXX9
+       default "6"
+

 config SERIAL_TXX9_CONSOLE
        bool "TMPTX39XX/49XX SIO Console support"
        depends on SERIAL_TXX9=y
 config SERIAL_TXX9_CONSOLE
        bool "TMPTX39XX/49XX SIO Console support"
        depends on SERIAL_TXX9=y


@@ -933,4 +1122,33 @@ config SERIAL_SGI_IOC3
          If you have an SGI Altix with an IOC3 serial card,
          say Y or M.  Otherwise, say N.
 
          If you have an SGI Altix with an IOC3 serial card,
          say Y or M.  Otherwise, say N.
 

+config SERIAL_NETX
+       bool "NetX serial port support"
+       depends on ARM && ARCH_NETX
+       select SERIAL_CORE
+       help
+         If you have a machine based on a Hilscher NetX SoC you
+         can enable its onboard serial port by enabling this option.
+
+          To compile this driver as a module, choose M here: the
+          module will be called netx-serial.
+
+config SERIAL_NETX_CONSOLE
+       bool "Console on NetX serial port"
+       depends on SERIAL_NETX
+       select SERIAL_CORE_CONSOLE
+       help
+         If you have enabled the serial port on the Motorola IMX
+         CPU you can make it the console by answering Y to this option.
+
+config SERIAL_OF_PLATFORM
+       tristate "Serial port on Open Firmware platform bus"
+       depends on PPC_OF
+       depends on SERIAL_8250
+       help
+         If you have a PowerPC based system that has serial ports
+         on a platform specific bus, you should enable this option.
+         Currently, only 8250 compatible ports are supported, but
+         others can easily be added.
+

 endmenu
 endmenu