Merge branch 'next/cleanup' of git://git.linaro.org/people/arnd/arm-soc

* 'next/cleanup' of git://git.linaro.org/people/arnd/arm-soc: (125 commits)
  ARM: mach-mxs: fix machines' initializers order
  mmc: mxcmmc: explicitly includes mach/hardware.h
  arm/imx: explicitly includes mach/hardware.h in pm-imx27.c
  arm/imx: remove mx27_setup_weimcs() from mx27.h
  arm/imx: explicitly includes mach/hardware.h in mach-kzm_arm11_01.c
  arm/imx: remove mx31_setup_weimcs() from mx31.h
  ARM: tegra: devices.c should include devices.h
  ARM: tegra: cpu-tegra: unexport two functions
  ARM: tegra: cpu-tegra: sparse type fix
  ARM: tegra: dma: staticify some tables and functions
  ARM: tegra: tegra2_clocks: don't export some tables
  ARM: tegra: tegra_powergate_is_powered should be static
  ARM: tegra: tegra_rtc_read_ms should be static
  ARM: tegra: tegra_init_cache should be static
  ARM: tegra: pcie: 0 -> NULL changes
  ARM: tegra: pcie: include board.h
  ARM: tegra: pcie: don't cast __iomem pointers
  ARM: tegra: tegra2_clocks: 0 -> NULL changes
  ARM: tegra: tegra2_clocks: don't cast __iomem pointers
  ARM: tegra: timer: don't cast __iomem pointers
  ...

Fix up trivial conflicts in
  arch/arm/mach-omap2/Makefile,
  arch/arm/mach-u300/{Makefile.boot,core.c}
  arch/arm/plat-{mxc,omap}/devices.c

1 files changed, 4 insertions, 4 deletions

diff --git a/arch/arm/plat-omap/i2c.c b/arch/arm/plat-omap/i2c.c
index 2388b8eebaaa..a162b2c2ae15 100644
--- a/arch/arm/plat-omap/i2c.c
+++ b/arch/arm/plat-omap/i2c.c
@@ -151,7 +151,7 @@ static inline int omap2_i2c_add_bus(int bus_id)
 {
         int l;
         struct omap_hwmod *oh;
-        struct omap_device *od;
+        struct platform_device *pdev;
         char oh_name[MAX_OMAP_I2C_HWMOD_NAME_LEN];
         struct omap_i2c_bus_platform_data *pdata;
         struct omap_i2c_dev_attr *dev_attr;
@@ -187,12 +187,12 @@ static inline int omap2_i2c_add_bus(int bus_id)
          */
         if (cpu_is_omap34xx())
                 pdata->set_mpu_wkup_lat = omap_pm_set_max_mpu_wakeup_lat_compat;
-        od = omap_device_build(name, bus_id, oh, pdata,
+        pdev = omap_device_build(name, bus_id, oh, pdata,
                         sizeof(struct omap_i2c_bus_platform_data),
                         omap_i2c_latency, ARRAY_SIZE(omap_i2c_latency), 0);
-        WARN(IS_ERR(od), "Could not build omap_device for %s\n", name);
+        WARN(IS_ERR(pdev), "Could not build omap_device for %s\n", name);
 
-        return PTR_ERR(od);
+        return PTR_ERR(pdev);
 }
 #else
 static inline int omap2_i2c_add_bus(int bus_id)