Merge master.kernel.org:/home/rmk/linux-2.6-serial

diff --combined drivers/serial/Kconfig
index ee4265d7a8c9d9130b96293b980cb0dc21e3e17f,42d1de155292439c3c950ad728f511ccefb4c3c2..0f4361c8466b3d495442e9ca69fd17250606b0ef
--- 1/drivers/serial/Kconfig
--- 2/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@@ -98,6 -98,7 +98,7 @@@ config SERIAL_8250_NR_UART
  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
@@@ -892,20 -893,20 +893,20 @@@ config SERIAL_VR41XX_CONSOL
          a console on a serial port, say Y.  Otherwise, say N.
  
  config SERIAL_JSM
 -        tristate "Digi International NEO PCI Support"
 -      depends on PCI && BROKEN
 -        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>.
 -
 -          To compile this driver as a module, choose M here: the
 -          module will be called jsm.
 +      tristate "Digi International NEO PCI Support"
 +      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>.
 +
 +        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"