V4L/DVB (4495): Fix "no data from ZL10353 based USB tuner" problem

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

diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index ad47c1b..5b48ac2 100644 (file)
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -10,7 +10,7 @@ menu "Serial drivers"
 # The new 8250/16550 serial drivers
 config SERIAL_8250
        tristate "8250/16550 and compatible serial support"
 # The new 8250/16550 serial drivers
 config SERIAL_8250
        tristate "8250/16550 and compatible serial support"

-       depends on (BROKEN || !(SPARC64 || SPARC32))
+       depends on (BROKEN || !SPARC)

        select SERIAL_CORE
        ---help---
          This selects whether you want to include the driver for the standard
        select SERIAL_CORE
        ---help---
          This selects whether you want to include the driver for the standard


@@ -23,7 +23,7 @@ config SERIAL_8250
          work.)
 
          To compile this driver as a module, choose M here: the
          work.)
 
          To compile this driver as a module, choose M here: the

-         module will be called serial.
+         module will be called 8250.

          [WARNING: Do not compile this driver as a module if you are using
          non-standard serial ports, since the configuration information will
          be lost when the driver is unloaded.  This limitation may be lifted
          [WARNING: Do not compile this driver as a module if you are using
          non-standard serial ports, since the configuration information will
          be lost when the driver is unloaded.  This limitation may be lifted


@@ -63,6 +63,33 @@ 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
+         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
+         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
+       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 +104,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


@@ -95,6 +114,17 @@ config SERIAL_8250_NR_UARTS
          PCI enumeration and any ports that may be added at run-time
          via hot-plug, or any ISA multi-port serial cards.
 
          PCI enumeration and any ports that may be added at run-time
          via hot-plug, or any ISA multi-port serial cards.
 

+config SERIAL_8250_RUNTIME_UARTS
+       int "Number of 8250/16550 serial ports to register at runtime"
+       depends on SERIAL_8250
+       range 0 SERIAL_8250_NR_UARTS
+       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
+         with the module parameter "nr_uarts", or boot-time parameter
+         8250.nr_uarts
+

 config SERIAL_8250_EXTENDED
        bool "Extended 8250/16550 serial driver options"
        depends on SERIAL_8250
 config SERIAL_8250_EXTENDED
        bool "Extended 8250/16550 serial driver options"
        depends on SERIAL_8250


@@ -180,7 +210,6 @@ config SERIAL_8250_BOCA
          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_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


@@ -270,6 +299,41 @@ config SERIAL_AMBA_PL011_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_AT91
+       bool "AT91RM9200 / AT91SAM9261 serial port support"
+       depends on ARM && (ARCH_AT91RM9200 || ARCH_AT91SAM9261)
+       select SERIAL_CORE
+       help
+         This enables the driver for the on-chip UARTs of the Atmel
+         AT91RM9200 and AT91SAM926 processor.
+
+config SERIAL_AT91_CONSOLE
+       bool "Support for console on AT91RM9200 / AT91SAM9261 serial port"
+       depends on SERIAL_AT91=y
+       select SERIAL_CORE_CONSOLE
+       help
+         Say Y here if you wish to use a UART on the Atmel AT91RM9200 or
+         AT91SAM9261 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
+       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.
+         The ttySn nodes are legally reserved for the 8250 serial driver
+         but are often misused by other serial drivers.
+
+         To use this, you should create suitable ttyATn device nodes in
+         /dev/, and pass "console=ttyATn" to the kernel.
+
+         Say Y if you have an external 8250/16C550 UART.  If unsure, say N.
+

 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


@@ -290,21 +354,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


@@ -359,29 +426,6 @@ config SERIAL_21285_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_UART00
-       bool "Excalibur serial port (uart00) support"
-       depends on ARM && ARCH_CAMELOT
-       select SERIAL_CORE
-       help
-         Say Y here if you want to use the hard logic uart on Excalibur. This
-         driver also supports soft logic implementations of this uart core.
-
-config SERIAL_UART00_CONSOLE
-       bool "Support for console on Excalibur serial port"
-       depends on SERIAL_UART00
-       select SERIAL_CORE_CONSOLE
-       help
-         Say Y here if you want to support a serial console on an Excalibur
-         hard logic uart or uart00 IP core.
-
-         Even if you say Y here, the currently visible virtual 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=ttyS1". (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.)
-

 config SERIAL_MPSC
        bool "Marvell MPSC serial port support"
        depends on PPC32 && MV64X60
 config SERIAL_MPSC
        bool "Marvell MPSC serial port support"
        depends on PPC32 && MV64X60


@@ -469,14 +513,14 @@ config SERIAL_IMX_CONSOLE
 
 config SERIAL_SUNCORE
        bool
 
 config SERIAL_SUNCORE
        bool

-       depends on SPARC32 || SPARC64
+       depends on SPARC

        select SERIAL_CORE
        select SERIAL_CORE_CONSOLE
        default y
 
 config SERIAL_SUNZILOG
        tristate "Sun Zilog8530 serial support"
        select SERIAL_CORE
        select SERIAL_CORE_CONSOLE
        default y
 
 config SERIAL_SUNZILOG
        tristate "Sun Zilog8530 serial support"

-       depends on SPARC32 || SPARC64
+       depends on SPARC

        help
          This driver supports the Zilog8530 serial ports found on many Sparc
          systems.  Say Y or M if you want to be able to these serial ports.
        help
          This driver supports the Zilog8530 serial ports found on many Sparc
          systems.  Say Y or M if you want to be able to these serial ports.


@@ -491,7 +535,7 @@ config SERIAL_SUNZILOG_CONSOLE
 
 config SERIAL_SUNSU
        tristate "Sun SU serial support"
 
 config SERIAL_SUNSU
        tristate "Sun SU serial support"

-       depends on (SPARC32 || SPARC64) && PCI
+       depends on SPARC && PCI

        help
          This driver supports the 8250 serial ports that run the keyboard and
          mouse on (PCI) UltraSPARC systems.  Say Y or M if you want to be able
        help
          This driver supports the 8250 serial ports that run the keyboard and
          mouse on (PCI) UltraSPARC systems.  Say Y or M if you want to be able


@@ -547,7 +591,7 @@ config PDC_CONSOLE
 
 config SERIAL_SUNSAB
        tristate "Sun Siemens SAB82532 serial support"
 
 config SERIAL_SUNSAB
        tristate "Sun Siemens SAB82532 serial support"

-       depends on (SPARC32 || SPARC64) && PCI
+       depends on SPARC && PCI

        help
          This driver supports the Siemens SAB82532 DUSCC serial ports on newer
          (PCI) UltraSPARC systems.  Say Y or M if you want to be able to these
        help
          This driver supports the Siemens SAB82532 DUSCC serial ports on newer
          (PCI) UltraSPARC systems.  Say Y or M if you want to be able to these


@@ -561,6 +605,13 @@ config SERIAL_SUNSAB_CONSOLE
          on your Sparc system as the console, you can do so by answering
          Y to this option.
 
          on your Sparc system as the console, you can do so by answering
          Y to this option.
 

+config SERIAL_SUNHV
+       bool "Sun4v Hypervisor Console support"
+       depends on SPARC64
+       help
+         This driver supports the console device found on SUN4V Sparc
+         systems.  Say Y if you want to be able to use this device.
+

 config SERIAL_IP22_ZILOG
        tristate "IP22 Zilog8530 serial support"
        depends on SGI_IP22
 config SERIAL_IP22_ZILOG
        tristate "IP22 Zilog8530 serial support"
        depends on SGI_IP22


@@ -600,22 +651,6 @@ config SERIAL_SH_SCI_CONSOLE
        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
-       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.
-
-config SERIAL_AU1X00_CONSOLE
-       bool "Enable Au1x00 serial console"
-       depends on SERIAL_AU1X00
-       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.
-

 config SERIAL_CORE
        tristate
 
 config SERIAL_CORE
        tristate
 


@@ -799,6 +834,7 @@ config SERIAL_ICOM
        tristate "IBM Multiport Serial Adapter"
        depends on PCI && (PPC_ISERIES || PPC_PSERIES)
        select SERIAL_CORE
        tristate "IBM Multiport Serial Adapter"
        depends on PCI && (PPC_ISERIES || PPC_PSERIES)
        select SERIAL_CORE

+       select FW_LOADER

        help
          This driver is for a family of multiport serial adapters
          including 2 port RVX, 2 port internal modem, 4 port internal
        help
          This driver is for a family of multiport serial adapters
          including 2 port RVX, 2 port internal modem, 4 port internal


@@ -827,7 +863,7 @@ config SERIAL_M32R_SIO_CONSOLE
 
 config SERIAL_M32R_PLDSIO
        bool "M32R SIO I/F on a PLD"
 
 config SERIAL_M32R_PLDSIO
        bool "M32R SIO I/F on a PLD"

-       depends on SERIAL_M32R_SIO=y && (PLAT_OPSPUT || PALT_USRV || PLAT_M32700UT)
+       depends on SERIAL_M32R_SIO=y && (PLAT_OPSPUT || PLAT_USRV || PLAT_M32700UT)

        default n
        help
          Say Y here if you want to use the M32R serial controller
        default n
        help
          Say Y here if you want to use the M32R serial controller


@@ -838,7 +874,7 @@ config SERIAL_M32R_PLDSIO
 
 config SERIAL_TXX9
        bool "TMPTX39XX/49XX SIO support"
 
 config SERIAL_TXX9
        bool "TMPTX39XX/49XX SIO support"

-       depends HAS_TXX9_SERIAL && BROKEN
+       depends HAS_TXX9_SERIAL

        select SERIAL_CORE
        default y
 
        select SERIAL_CORE
        default y
 


@@ -872,20 +908,20 @@ config SERIAL_VR41XX_CONSOLE
          a console on a serial port, say Y.  Otherwise, say N.
 
 config SERIAL_JSM
          a console on a serial port, say Y.  Otherwise, say N.
 
 config SERIAL_JSM

-        tristate "Digi International NEO PCI Support"
+       tristate "Digi International NEO PCI Support"

        depends on PCI
        depends on PCI

-        select SERIAL_CORE
-        help
-          This is a driver for Digi International's Neo series
-          of cards which provide multiple serial ports. You would need
-          something like this to connect more than two modems to your Linux
-          box, for instance in order to become a dial-in server. This driver
-          supports PCI boards only.
-          If you have a card like this, say Y here and read the file
-          <file:Documentation/jsm.txt>.
+       select SERIAL_CORE
+       help
+         This is a driver for Digi International's Neo series
+         of cards which provide multiple serial ports. You would need
+         something like this to connect more than two modems to your Linux
+         box, for instance in order to become a dial-in server. This driver
+         supports PCI boards only.

 
 

-          To compile this driver as a module, choose M here: the
-          module will be called jsm.
+         If you have a card like this, say Y here, otherwise say N.
+
+         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"
 
 config SERIAL_SGI_IOC4
        tristate "SGI IOC4 controller serial support"


@@ -896,4 +932,31 @@ config SERIAL_SGI_IOC4
                and wish to use the serial ports on this card, say Y.
                Otherwise, say N.
 
                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_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.
+

 endmenu
 endmenu