From: Anton Vorontsov <avorontsov@ru.mvista.com>
Date: Tue, 22 Sep 2009 23:49:27 +0000 (+0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Tag: v2.6.32-rc1~158^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=f056878332a91ed984a116bad4e7d49aefff9e6e

Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6

Conflicts:
	drivers/power/wm97xx_battery.c
---

f056878332a91ed984a116bad4e7d49aefff9e6e
diff --cc drivers/power/wm97xx_battery.c
index c552082c8128,b787335a8419..f2bfd296dbae
--- a/drivers/power/wm97xx_battery.c
+++ b/drivers/power/wm97xx_battery.c
@@@ -33,20 -33,14 +33,20 @@@ static enum power_supply_property *prop
  
  static unsigned long wm97xx_read_bat(struct power_supply *bat_ps)
  {
 +	struct wm97xx_pdata *wmdata = bat_ps->dev->parent->platform_data;
 +	struct wm97xx_batt_pdata *pdata = wmdata->batt_pdata;
 +
- 	return wm97xx_read_aux_adc(bat_ps->dev->parent->driver_data,
+ 	return wm97xx_read_aux_adc(dev_get_drvdata(bat_ps->dev->parent),
  					pdata->batt_aux) * pdata->batt_mult /
  					pdata->batt_div;
  }
  
  static unsigned long wm97xx_read_temp(struct power_supply *bat_ps)
  {
 +	struct wm97xx_pdata *wmdata = bat_ps->dev->parent->platform_data;
 +	struct wm97xx_batt_pdata *pdata = wmdata->batt_pdata;
 +
- 	return wm97xx_read_aux_adc(bat_ps->dev->parent->driver_data,
+ 	return wm97xx_read_aux_adc(dev_get_drvdata(bat_ps->dev->parent),
  					pdata->temp_aux) * pdata->temp_mult /
  					pdata->temp_div;
  }