Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-serial

* 'devel' of master.kernel.org:/home/rmk/linux-2.6-serial:
  [ARM] 3600/1: increase amba-pl010 UART_NR to 8
  [ARM] 3571/1: netX: serial driver for Hilscher netX

diff --combined drivers/serial/Kconfig
index 5ea778f,5fff79e..bef4a96
--- 1/drivers/serial/Kconfig
--- 2/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@@ -300,22 -300,21 +300,22 @@@ config SERIAL_AMBA_PL011_CONSOL
          kernel at boot time.)
  
  config SERIAL_AT91
 -      bool "AT91RM9200 serial port support"
 -      depends on ARM && ARCH_AT91RM9200
 +      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 AT91RM9200
 -        processor.
 +        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 serial port"
 +      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 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 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"
@@@ -937,4 -936,23 +937,23 @@@ config SERIAL_SGI_IOC
          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