From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 3 Oct 2012 01:51:10 +0000 (+1000)
Subject: Merge remote-tracking branch 'i2c-embedded/i2c-embedded/for-next'
X-Git-Tag: next-20121003~68
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ab45f28d61f251e114ad9d88c529465a05adbc8c;p=karo-tx-linux.git

Merge remote-tracking branch 'i2c-embedded/i2c-embedded/for-next'

Conflicts:
	drivers/i2c/busses/i2c-omap.c
---

ab45f28d61f251e114ad9d88c529465a05adbc8c
diff --cc drivers/i2c/busses/i2c-davinci.c
index 79a2542d8c41,85ce548ff152..6a0a55319449
--- a/drivers/i2c/busses/i2c-davinci.c
+++ b/drivers/i2c/busses/i2c-davinci.c
@@@ -38,9 -38,11 +38,11 @@@
  #include <linux/slab.h>
  #include <linux/cpufreq.h>
  #include <linux/gpio.h>
+ #include <linux/of_i2c.h>
+ #include <linux/of_device.h>
  
  #include <mach/hardware.h>
 -#include <mach/i2c.h>
 +#include <linux/platform_data/i2c-davinci.h>
  
  /* ----- global defines ----------------------------------------------- */
  
diff --cc drivers/i2c/busses/i2c-omap.c
index a0e49f6aaf96,c78431a4970a..0b0254312d21
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@@ -943,12 -1051,11 +1051,12 @@@ omap_i2c_probe(struct platform_device *
  {
  	struct omap_i2c_dev	*dev;
  	struct i2c_adapter	*adap;
- 	struct resource		*mem, *irq, *ioarea;
+ 	struct resource		*mem;
 -	struct omap_i2c_bus_platform_data *pdata = pdev->dev.platform_data;
 +	const struct omap_i2c_bus_platform_data *pdata =
 +		pdev->dev.platform_data;
  	struct device_node	*node = pdev->dev.of_node;
  	const struct of_device_id *match;
- 	irq_handler_t isr;
+ 	int irq;
  	int r;
  
  	/* NOTE: driver uses the static register mapping */