Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6

[powerpc.git] / drivers / serial / Kconfig

diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 5ea778f..d926272 100644 (file)
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -295,7 +295,7 @@ 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.)
 


@@ -354,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


@@ -639,12 +642,17 @@ 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
 


@@ -937,4 +945,23 @@ 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.
+

 endmenu
 endmenu