From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 20 Feb 2013 04:39:42 +0000 (+1100)
Subject: Merge remote-tracking branch 'staging/staging-next'
X-Git-Tag: next-20130220~26
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0b7ca956de74d297200f878204b6327499392662;p=karo-tx-linux.git

Merge remote-tracking branch 'staging/staging-next'

Conflicts:
	drivers/staging/et131x/et131x.c
---

0b7ca956de74d297200f878204b6327499392662
diff --cc arch/arm/mach-omap2/board-rx51-peripherals.c
index 1a2c4db13e32,f3d075baebb6..ef614d2e0b19
--- a/arch/arm/mach-omap2/board-rx51-peripherals.c
+++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
@@@ -40,9 -40,9 +40,9 @@@
  #include <sound/tpa6130a2-plat.h>
  #include <media/radio-si4713.h>
  #include <media/si4713.h>
 -#include <linux/leds-lp5523.h>
 +#include <linux/platform_data/leds-lp55xx.h>
  
- #include <../drivers/staging/iio/light/tsl2563.h>
+ #include <linux/platform_data/tsl2563.h>
  #include <linux/lis3lv02d.h>
  
  #if defined(CONFIG_IR_RX51) || defined(CONFIG_IR_RX51_MODULE)
diff --cc drivers/power/generic-adc-battery.c
index 836816b82cbc,42733c4dcb0e..8cb5d7f67ace
--- a/drivers/power/generic-adc-battery.c
+++ b/drivers/power/generic-adc-battery.c
@@@ -284,11 -287,10 +284,11 @@@ static int gab_probe(struct platform_de
  	 * based on the channel supported by consumer device.
  	 */
  	for (chan = 0; chan < ARRAY_SIZE(gab_chan_name); chan++) {
- 		adc_bat->channel[chan] = iio_channel_get(dev_name(&pdev->dev),
- 						gab_chan_name[chan]);
+ 		adc_bat->channel[chan] = iio_channel_get(&pdev->dev,
+ 							 gab_chan_name[chan]);
  		if (IS_ERR(adc_bat->channel[chan])) {
  			ret = PTR_ERR(adc_bat->channel[chan]);
 +			adc_bat->channel[chan] = NULL;
  		} else {
  			/* copying properties for supported channels only */
  			memcpy(properties + sizeof(*(psy->properties)) * index,