Merge branch 'depends/rmk/memory_h' into next/fixes

Fix up all conflicts between the memory.h cleanup and bug fixes.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --cc arch/arm/Kconfig
index cbb1826,b7f7510..60ca033
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -835,7 -860,7 +860,8 @@@ config ARCH_U30
        select CLKDEV_LOOKUP
        select HAVE_MACH_CLKDEV
        select GENERIC_GPIO
 +      select ARCH_REQUIRE_GPIOLIB
+       select NEED_MACH_MEMORY_H
        help
          Support for ST-Ericsson U300 series mobile platforms.
  

diff --cc arch/arm/kernel/setup.c
Simple merge

diff --cc arch/arm/mach-davinci/board-da850-evm.c
Simple merge

diff --cc arch/arm/mach-davinci/sleep.S
Simple merge

diff --cc arch/arm/mach-ep93xx/edb93xx.c
Simple merge

diff --cc arch/arm/mach-ep93xx/simone.c
Simple merge

diff --cc arch/arm/mach-ep93xx/snappercl15.c
Simple merge

diff --cc arch/arm/mach-exynos4/mach-universal_c210.c
Simple merge

diff --cc arch/arm/mach-imx/mach-cpuimx27.c
index f851fe9,881add0..b1ec2cf
--- 1/arch/arm/mach-imx/mach-cpuimx27.c
--- 2/arch/arm/mach-imx/mach-cpuimx27.c
+++ b/arch/arm/mach-imx/mach-cpuimx27.c
@@@ -310,8 -310,8 +310,8 @@@ static struct sys_timer eukrea_cpuimx27
        .init = eukrea_cpuimx27_timer_init,
  };
  
 -MACHINE_START(CPUIMX27, "EUKREA CPUIMX27")
 +MACHINE_START(EUKREA_CPUIMX27, "EUKREA CPUIMX27")
-       .boot_params = MX27_PHYS_OFFSET + 0x100,
+       .atag_offset = 0x100,
        .map_io = mx27_map_io,
        .init_early = imx27_init_early,
        .init_irq = mx27_init_irq,

diff --cc arch/arm/mach-imx/mach-cpuimx35.c
index 4bd083b,10b8913..470b654
--- 1/arch/arm/mach-imx/mach-cpuimx35.c
--- 2/arch/arm/mach-imx/mach-cpuimx35.c
+++ b/arch/arm/mach-imx/mach-cpuimx35.c
@@@ -192,9 -192,9 +192,9 @@@ struct sys_timer eukrea_cpuimx35_timer 
        .init   = eukrea_cpuimx35_timer_init,
  };
  
 -MACHINE_START(EUKREA_CPUIMX35, "Eukrea CPUIMX35")
 +MACHINE_START(EUKREA_CPUIMX35SD, "Eukrea CPUIMX35")
        /* Maintainer: Eukrea Electromatique */
-       .boot_params = MX3x_PHYS_OFFSET + 0x100,
+       .atag_offset = 0x100,
        .map_io = mx35_map_io,
        .init_early = imx35_init_early,
        .init_irq = mx35_init_irq,

diff --cc arch/arm/mach-imx/mach-eukrea_cpuimx25.c
index 2442d5d,d8699b5..9163318
--- 1/arch/arm/mach-imx/mach-eukrea_cpuimx25.c
--- 2/arch/arm/mach-imx/mach-eukrea_cpuimx25.c
+++ b/arch/arm/mach-imx/mach-eukrea_cpuimx25.c
@@@ -161,9 -161,9 +161,9 @@@ static struct sys_timer eukrea_cpuimx25
        .init   = eukrea_cpuimx25_timer_init,
  };
  
 -MACHINE_START(EUKREA_CPUIMX25, "Eukrea CPUIMX25")
 +MACHINE_START(EUKREA_CPUIMX25SD, "Eukrea CPUIMX25")
        /* Maintainer: Eukrea Electromatique */
-       .boot_params = MX25_PHYS_OFFSET + 0x100,
+       .atag_offset = 0x100,
        .map_io = mx25_map_io,
        .init_early = imx25_init_early,
        .init_irq = mx25_init_irq,

diff --cc arch/arm/mach-imx/mach-mx27ads.c
Simple merge

diff --cc arch/arm/mach-imx/mach-mx31_3ds.c
Simple merge

diff --cc arch/arm/mach-integrator/integrator_ap.c
Simple merge

diff --cc arch/arm/mach-ixp4xx/dsmg600-setup.c
Simple merge

diff --cc arch/arm/mach-ixp4xx/fsg-setup.c
Simple merge

diff --cc arch/arm/mach-ixp4xx/nas100d-setup.c
Simple merge

diff --cc arch/arm/mach-ixp4xx/nslu2-setup.c
Simple merge

diff --cc arch/arm/mach-ks8695/board-acs5k.c
Simple merge

diff --cc arch/arm/mach-ks8695/board-dsm320.c
Simple merge

diff --cc arch/arm/mach-ks8695/board-micrel.c
Simple merge

diff --cc arch/arm/mach-lpc32xx/phy3250.c
Simple merge

diff --cc arch/arm/mach-msm/board-msm7x27.c
Simple merge

diff --cc arch/arm/mach-msm/board-msm7x30.c
Simple merge

diff --cc arch/arm/mach-msm/board-qsd8x50.c
Simple merge

diff --cc arch/arm/mach-msm/board-sapphire.c
Simple merge

diff --cc arch/arm/mach-nomadik/board-nhk8815.c
Simple merge

diff --cc arch/arm/mach-omap1/board-ams-delta.c
Simple merge

diff --cc arch/arm/mach-omap1/board-fsample.c
Simple merge

diff --cc arch/arm/mach-omap1/board-generic.c
Simple merge

diff --cc arch/arm/mach-omap1/board-h2.c
Simple merge

diff --cc arch/arm/mach-omap1/board-h3.c
Simple merge

diff --cc arch/arm/mach-omap1/board-htcherald.c
Simple merge

diff --cc arch/arm/mach-omap1/board-innovator.c
Simple merge

diff --cc arch/arm/mach-omap1/board-nokia770.c
Simple merge

diff --cc arch/arm/mach-omap1/board-osk.c
Simple merge

diff --cc arch/arm/mach-omap1/board-palmte.c
Simple merge

diff --cc arch/arm/mach-omap1/board-palmtt.c
Simple merge

diff --cc arch/arm/mach-omap1/board-palmz71.c
Simple merge

diff --cc arch/arm/mach-omap1/board-perseus2.c
Simple merge

diff --cc arch/arm/mach-omap1/board-sx1.c
Simple merge

diff --cc arch/arm/mach-omap1/board-voiceblue.c
Simple merge

diff --cc arch/arm/mach-omap2/board-2430sdp.c
Simple merge

diff --cc arch/arm/mach-omap2/board-4430sdp.c
Simple merge

diff --cc arch/arm/mach-omap2/board-generic.c
Simple merge

diff --cc arch/arm/mach-omap2/board-h4.c
Simple merge

diff --cc arch/arm/mach-omap2/board-ldp.c
Simple merge

diff --cc arch/arm/mach-orion5x/db88f5281-setup.c
Simple merge

diff --cc arch/arm/mach-orion5x/dns323-setup.c
Simple merge

diff --cc arch/arm/mach-orion5x/kurobox_pro-setup.c
Simple merge

diff --cc arch/arm/mach-orion5x/mv2120-setup.c
Simple merge

diff --cc arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c
Simple merge

diff --cc arch/arm/mach-orion5x/rd88f5181l-ge-setup.c
Simple merge

diff --cc arch/arm/mach-orion5x/rd88f5182-setup.c
Simple merge

diff --cc arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c
Simple merge

diff --cc arch/arm/mach-orion5x/terastation_pro2-setup.c
Simple merge

diff --cc arch/arm/mach-orion5x/ts209-setup.c
Simple merge

diff --cc arch/arm/mach-orion5x/ts409-setup.c
Simple merge

diff --cc arch/arm/mach-orion5x/wnr854t-setup.c
Simple merge

diff --cc arch/arm/mach-orion5x/wrt350n-v2-setup.c
Simple merge

diff --cc arch/arm/mach-pxa/balloon3.c
Simple merge

diff --cc arch/arm/mach-pxa/cm-x2xx.c
Simple merge

diff --cc arch/arm/mach-pxa/cm-x300.c
Simple merge

diff --cc arch/arm/mach-pxa/lpd270.c
Simple merge

diff --cc arch/arm/mach-pxa/mainstone.c
Simple merge

diff --cc arch/arm/mach-pxa/palmtreo.c
index 30364b0,7346fbf..94e9708
--- 1/arch/arm/mach-pxa/palmtreo.c
--- 2/arch/arm/mach-pxa/palmtreo.c
+++ b/arch/arm/mach-pxa/palmtreo.c
@@@ -441,11 -438,9 +441,11 @@@ static void __init centro_init(void
        palm27x_mmc_init(GPIO_NR_TREO_SD_DETECT_N, -1,
                        GPIO_NR_CENTRO_SD_POWER, 1);
  }
 +#endif
  
 +#ifdef CONFIG_MACH_TREO680
  MACHINE_START(TREO680, "Palm Treo 680")
-       .boot_params    = 0xa0000100,
+       .atag_offset    = 0x100,
        .map_io         = pxa27x_map_io,
        .reserve        = treo_reserve,
        .init_irq       = pxa27x_init_irq,
@@@ -453,11 -448,9 +453,11 @@@
        .timer          = &pxa_timer,
        .init_machine   = treo680_init,
  MACHINE_END
 +#endif
  
 +#ifdef CONFIG_MACH_CENTRO
  MACHINE_START(CENTRO, "Palm Centro 685")
-       .boot_params    = 0xa0000100,
+       .atag_offset    = 0x100,
        .map_io         = pxa27x_map_io,
        .reserve        = treo_reserve,
        .init_irq       = pxa27x_init_irq,

diff --cc arch/arm/mach-pxa/palmtx.c
Simple merge

diff --cc arch/arm/mach-pxa/saarb.c
Simple merge

diff --cc arch/arm/mach-pxa/z2.c
Simple merge

diff --cc arch/arm/mach-pxa/zeus.c
Simple merge

diff --cc arch/arm/mach-s3c64xx/mach-smdk6410.c
Simple merge

diff --cc arch/arm/mach-shmobile/board-ag5evm.c
Simple merge

diff --cc arch/arm/mach-shmobile/board-ap4evb.c
Simple merge

diff --cc arch/arm/mach-shmobile/board-mackerel.c
Simple merge

diff --cc arch/arm/mach-u300/core.c
Simple merge

diff --cc arch/arm/mach-ux500/board-mop500.c
Simple merge

diff --cc arch/arm/mach-ux500/board-u5500.c
Simple merge

diff --cc arch/arm/mach-vexpress/v2m.c
Simple merge

diff --cc arch/arm/mm/dma-mapping.c
Simple merge

diff --cc arch/arm/mm/init.c
Simple merge