[PATCH] atmel_serial: Rename at91_register_uart_fns

[powerpc.git] / drivers / serial / Kconfig

diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 5b48ac2..ba19ab5 100644 (file)
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -121,7 +121,7 @@ config SERIAL_8250_RUNTIME_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
+         the kernel to register at boot time.  This can be overridden
          with the module parameter "nr_uarts", or boot-time parameter
          8250.nr_uarts
 
@@ -205,7 +205,7 @@ config SERIAL_8250_BOCA
        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.
@@ -295,21 +295,21 @@ 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
-         "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.)
 
-config SERIAL_AT91
-       bool "AT91RM9200 / AT91SAM9261 serial port support"
+config SERIAL_ATMEL
+       bool "AT91 / AT32 on-chip 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
+config SERIAL_ATMEL_CONSOLE
+       bool "Support for console on AT91 / AT32 serial port"
+       depends on SERIAL_ATMEL=y
        select SERIAL_CORE_CONSOLE
        help
          Say Y here if you wish to use a UART on the Atmel AT91RM9200 or
@@ -317,9 +317,9 @@ config SERIAL_AT91_CONSOLE
          which receives all kernel messages and warnings and which allows
          logins in single user mode).
 
-config SERIAL_AT91_TTYAT
+config SERIAL_ATMEL_TTYAT
        bool "Install as device ttyAT0-4 instead of ttyS0-4"
-       depends on SERIAL_AT91=y
+       depends on SERIAL_ATMEL=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
@@ -556,10 +556,11 @@ config SERIAL_MUX
        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
@@ -642,12 +643,17 @@ config V850E_UART_CONSOLE
        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
 
+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
-       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
 
@@ -662,7 +668,7 @@ config SERIAL_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"