Merge tag 'for-v3.10-fixes' of git://git.infradead.org/battery-2.6

Pull bettery fixes from Anton Vorontsov:
 "Last minute one-liners: wrong kfree usage fix, module alias fixup and
  kconfig adjustments"

* tag 'for-v3.10-fixes' of git://git.infradead.org/battery-2.6:
  pm2301_charger: Fix module alias prefix
  wm831x_backup: Fix wrong kfree call for devdata->backup.name
  bq27x00: Fix I2C dependency in KConfig
  lp8788-charger: Fix kconfig dependency

diff --combined drivers/power/Kconfig
index 0d0b5d7d19d02f9e2c0a245de4da43f084e3340e,674e633a5e1b69d41ecda7afad0b54d1eb666de7..7b8979c63f4882e6c3e5375b9f9c35c40e5a829c
--- 1/drivers/power/Kconfig
--- 2/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@@ -152,6 -152,7 +152,7 @@@ config BATTERY_SB
  
  config BATTERY_BQ27x00
        tristate "BQ27x00 battery driver"
+       depends on I2C || I2C=n
        help
          Say Y here to enable support for batteries with BQ27x00 (I2C/HDQ) chips.
  
@@@ -254,7 -255,7 +255,7 @@@ config BATTERY_RX5
  
  config CHARGER_ISP1704
        tristate "ISP1704 USB Charger Detection"
 -      depends on USB_OTG_UTILS
 +      depends on USB_PHY
        help
          Say Y to enable support for USB Charger Detection with
          ISP1707/ISP1704 USB transceivers.
@@@ -284,6 -285,7 +285,7 @@@ config CHARGER_LP878
        tristate "TI LP8788 charger driver"
        depends on MFD_LP8788
        depends on LP8788_ADC
+       depends on IIO
        help
          Say Y to enable support for the LP8788 linear charger.
  

diff --combined drivers/power/pm2301_charger.c
index a44175139bbf3a619d65fe611cc9fa961388cd76,e9c6ba0fee7bf9b5f3ef62eeca42a543dcaa85a2..fef56e2041b325cf9e086d434f1755fbca0a8857
--- 1/drivers/power/pm2301_charger.c
--- 2/drivers/power/pm2301_charger.c
+++ b/drivers/power/pm2301_charger.c
@@@ -226,7 -226,7 +226,7 @@@ static int pm2xxx_charger_ovv_mngt(stru
  
  static int pm2xxx_charger_wd_exp_mngt(struct pm2xxx_charger *pm2, int val)
  {
 -      dev_dbg(pm2->dev , "20 minutes watchdog occured\n");
 +      dev_dbg(pm2->dev , "20 minutes watchdog expired\n");
  
        pm2->ac.wd_expired = true;
        power_supply_changed(&pm2->ac_chg.psy);
@@@ -1269,5 -1269,5 +1269,5 @@@ module_exit(pm2xxx_charger_exit)
  
  MODULE_LICENSE("GPL v2");
  MODULE_AUTHOR("Rajkumar kasirajan, Olivier Launay");
- MODULE_ALIAS("platform:pm2xxx-charger");
+ MODULE_ALIAS("i2c:pm2xxx-charger");
  MODULE_DESCRIPTION("PM2xxx charger management driver");