Merge the easy part of the IOP branch

diff --combined arch/arm/Kconfig
index 8136d32cd78fbb35b7d88746b841d5212483b79b,3f48e35ee61abbea72dce366f48bb3565d78b7d0..2c32c8702cfda39d42446cf1ddef9c4b2773527d
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -233,6 -233,8 +233,8 @@@ config ARCH_IOP33
  
  config ARCH_IOP13XX
        bool "IOP13xx-based"
+       depends on MMU
+       select PLAT_IOP
        select PCI
        help
          Support for Intel's IOP13XX (XScale) family of processors.
@@@ -271,14 -273,6 +273,14 @@@ config ARCH_L720
          If you have any questions or comments about the Linux kernel port
          to this board, send e-mail to <sjhill@cotw.com>.
  
 +config ARCH_NS9XXX
 +      bool "NetSilicon NS9xxx"
 +      help
 +        Say Y here if you intend to run this kernel on a NetSilicon NS9xxx
 +        System.
 +
 +        <http://www.digi.com/products/microprocessors/index.jsp>
 +
  config ARCH_PNX4008
        bool "Philips Nexperia PNX4008 Mobile"
        help
@@@ -288,7 -282,6 +290,7 @@@ config ARCH_PX
        bool "PXA2xx-based"
        depends on MMU
        select ARCH_MTD_XIP
 +      select GENERIC_TIME
        help
          Support for Intel's PXA2XX processor line.
  
@@@ -312,7 -305,7 +314,7 @@@ config ARCH_SA110
          Support for StrongARM 11x0 based boards.
  
  config ARCH_S3C2410
 -      bool "Samsung S3C2410, S3C2412, S3C2413, S3C2440, S3C2442"
 +      bool "Samsung S3C2410, S3C2412, S3C2413, S3C2440, S3C2442, S3C2443"
        help
          Samsung S3C2410X CPU based systems, such as the Simtec Electronics
          BAST (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or
@@@ -372,16 -365,7 +374,16 @@@ source "arch/arm/mach-omap1/Kconfig
  
  source "arch/arm/mach-omap2/Kconfig"
  
 +source "arch/arm/plat-s3c24xx/Kconfig"
 +
 +if ARCH_S3C2410
 +source "arch/arm/mach-s3c2400/Kconfig"
  source "arch/arm/mach-s3c2410/Kconfig"
 +source "arch/arm/mach-s3c2412/Kconfig"
 +source "arch/arm/mach-s3c2440/Kconfig"
 +source "arch/arm/mach-s3c2442/Kconfig"
 +source "arch/arm/mach-s3c2443/Kconfig"
 +endif
  
  source "arch/arm/mach-lh7a40x/Kconfig"
  
@@@ -395,12 -379,10 +397,12 @@@ source "arch/arm/mach-aaec2000/Kconfig
  
  source "arch/arm/mach-realview/Kconfig"
  
 -source "arch/arm/mach-at91rm9200/Kconfig"
 +source "arch/arm/mach-at91/Kconfig"
  
  source "arch/arm/mach-netx/Kconfig"
  
 +source "arch/arm/mach-ns9xxx/Kconfig"
 +
  # Definitions to make life easier
  config ARCH_ACORN
        bool
@@@ -758,20 -740,6 +760,20 @@@ config XIP_PHYS_ADD
          be linked for and stored to.  This address is dependent on your
          own flash usage.
  
 +config KEXEC
 +      bool "Kexec system call (EXPERIMENTAL)"
 +      depends on EXPERIMENTAL
 +      help
 +        kexec is a system call that implements the ability to shutdown your
 +        current kernel, and to start another kernel.  It is like a reboot
 +        but it is indepedent of the system firmware.   And like a reboot
 +        you can start any kernel with it, not just Linux.
 +
 +        It is an ongoing process to be certain the hardware in a machine
 +        is properly shutdown, so do not be surprised if this code does not
 +        initially work for you.  It may help to enable device hotplugging
 +        support.
 +
  endmenu
  
  if (ARCH_SA1100 || ARCH_INTEGRATOR || ARCH_OMAP || ARCH_IMX )