Merge branch 'next/multiplatform' into late/kirkwood

By Arnd Bergmann (15) and David Brown (1)
* next/multiplatform:
  ARM: msm: Move core.h contents into common.h
  ARM: spear: move platform_data definitions
  ARM: samsung: move platform_data definitions
  ARM: orion: move platform_data definitions
  ARM: nomadik: move platform_data definitions
  ARM: w90x900: move platform_data definitions
  ARM: vt8500: move platform_data definitions
  ARM: tegra: move sdhci platform_data definition
  ARM: sa1100: move platform_data definitions
  ARM: pxa: move platform_data definitions
  ARM: netx: move platform_data definitions
  ARM: msm: move platform_data definitions
  ARM: imx: move platform_data definitions
  ARM: ep93xx: move platform_data definitions
  ARM: davinci: move platform_data definitions
  ARM: at91: move platform_data definitions

diff --combined arch/arm/mach-sa1100/simpad.c
index 6ca92d0d32b2b392330d830cf076340cd39e0d5a,c73e1a3b430a8b18fe3966384259a1f887fe929d..71790e581d93abb567a5759253d33a949971a43b
--- 1/arch/arm/mach-sa1100/simpad.c
--- 2/arch/arm/mach-sa1100/simpad.c
+++ b/arch/arm/mach-sa1100/simpad.c
@@@ -24,7 -24,7 +24,7 @@@
  #include <asm/mach/flash.h>
  #include <asm/mach/map.h>
  #include <asm/mach/serial_sa1100.h>
- #include <mach/mcp.h>
+ #include <linux/platform_data/mfd-mcp-sa11x0.h>
  #include <mach/simpad.h>
  #include <mach/irqs.h>
  
@@@ -124,7 -124,7 +124,7 @@@ static struct map_desc simpad_io_desc[
                .length         = 0x00800000,
                .type           = MT_DEVICE
        }, {    /* Simpad CS3 */
 -              .virtual        = CS3_BASE,
 +              .virtual        = (unsigned long)CS3_BASE,
                .pfn            = __phys_to_pfn(SA1100_CS3_PHYS),
                .length         = 0x00100000,
                .type           = MT_DEVICE