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

* master.kernel.org:/home/rmk/linux-2.6-arm: (23 commits)
  [ARM] fix pxa930_trkball build errors
  [ARM] fix netx
  [ARM] fix pnx4008
  [ARM] fix pxa
  [ARM] remove missed CLPS7500 defconfig
  [ARM] clps711x: fix warning in edb7211-mm.c
  [ARM] clps711x: fix warning in fortunet
  [ARM] fix AT91, davinci, h720x, ks8695, msm, mx2, mx3, netx, omap1, omap2, pxa, s3c
  [ARM] Fix realview build
  [ARM] 5357/1: Kirkwood: add missing ge01 tclk initialization
  [ARM] 5358/1: AT2440EVB: Use new include path of mci.h
  [ARM] 5361/1: mv78xx0: fix compilation error
  [ARM] 5360/1: Orion: fix compilation error
  [ARM] 5359/1: Kirkwood: fix compilation error
  [ARM] S3C64XX: Fix EINT group macro definition
  [ARM] Ensure CONFIG_SERIAL_SAMSUNG_UARTS is always set.
  [ARM] S3C24XX: Add gpio_to_irq implementation
  [ARM] S3C24XX: Add gpio_to_irq() facility
  [ARM] footbridge: dc21285.c warning fixes
  [ARM] footbridge: add isa_init_irq() to common header
  ...

diff --combined drivers/serial/Kconfig
index 64fcf8c2082133c63343d0f6e021f20eb3ee1bcc,3e34605ee5a83ac73c8012055d2048e9a6876dab..3e525e38a5d998ffbd0331f0b51ebb65ec45ca3c
--- 1/drivers/serial/Kconfig
--- 2/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@@ -457,7 -457,7 +457,7 @@@ config SERIAL_SAMSUN
  
  config SERIAL_SAMSUNG_UARTS
        int
-       depends on SERIAL_SAMSUNG
+       depends on ARM && PLAT_S3C
        default 2 if ARCH_S3C2400
        default 4 if ARCH_S3C64XX || CPU_S3C2443
        default 3
@@@ -1320,30 -1320,13 +1320,30 @@@ config SERIAL_NETX_CONSOL
  config SERIAL_OF_PLATFORM
        tristate "Serial port on Open Firmware platform bus"
        depends on PPC_OF
 -      depends on SERIAL_8250
 +      depends on SERIAL_8250 || SERIAL_OF_PLATFORM_NWPSERIAL
        help
          If you have a PowerPC based system that has serial ports
          on a platform specific bus, you should enable this option.
          Currently, only 8250 compatible ports are supported, but
          others can easily be added.
  
 +config SERIAL_OF_PLATFORM_NWPSERIAL
 +      tristate "NWP serial port driver"
 +      depends on PPC_OF && PPC_DCR
 +      select SERIAL_OF_PLATFORM
 +      select SERIAL_CORE_CONSOLE
 +      select SERIAL_CORE
 +      help
 +        This driver supports the cell network processor nwp serial
 +        device.
 +
 +config SERIAL_OF_PLATFORM_NWPSERIAL_CONSOLE
 +      bool "Console on NWP serial port"
 +      depends on SERIAL_OF_PLATFORM_NWPSERIAL=y
 +      select SERIAL_CORE_CONSOLE
 +      help
 +        Support for Console on the NWP serial ports.
 +
  config SERIAL_QE
        tristate "Freescale QUICC Engine serial port support"
        depends on QUICC_ENGINE