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

diff --combined drivers/serial/Kconfig
index e0685a520514ff5684d511ac785c5e87246d4d2d,6627ddae6501a70071264e0c2e4dedfdd2fd9b48..5e7199f7b59cda1e9a45da991c2ebc92e0ce4fe8
--- 1/drivers/serial/Kconfig
--- 2/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@@ -190,6 -190,7 +190,6 @@@ config SERIAL_8250_BOC
          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
@@@ -847,7 -848,7 +847,7 @@@ config SERIAL_M32R_SIO_CONSOL
  
  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
@@@ -916,12 -917,4 +916,12 @@@ config SERIAL_SGI_IOC
                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.
 +
  endmenu