Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Anton Vorontsov [Tue, 22 Sep 2009 23:49:27 +0000 (03:49 +0400)]
Conflicts:
drivers/power/wm97xx_battery.c

1  2 
drivers/input/touchscreen/wm97xx-core.c
drivers/power/wm97xx_battery.c
include/linux/wm97xx.h

@@@ -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;
  }
Simple merge