Merge git://git.infradead.org/battery-2.6

* git://git.infradead.org/battery-2.6: (68 commits)
  power_supply: Mark da9052 driver as broken
  power_supply: Drop usage of nowarn variant of sysfs_create_link()
  s3c_adc_battery: Average over more than one adc sample
  power_supply: Add DA9052 battery driver
  isp1704_charger: Fix missing check
  jz4740-battery: Fix signedness bug
  power_supply: Assume mains power by default
  sbs-battery: Fix devicetree match table
  ARM: rx51: Add bq27200 i2c board info
  sbs-battery: Change power supply name
  devicetree-bindings: Propagate bq20z75->sbs rename to dt bindings
  devicetree-bindings: Add vendor entry for Smart Battery Systems
  sbs-battery: Rename internals to new name
  bq20z75: Rename to sbs-battery
  wm97xx_battery: Use DEFINE_MUTEX() for work_lock
  max8997_charger: Remove duplicate module.h
  lp8727_charger: Some minor fixes for the header
  lp8727_charger: Add header file
  power_supply: Convert drivers/power/* to use module_platform_driver()
  power_supply: Add "unknown" in power supply type
  ...

1 files changed, 4 insertions, 3 deletions

diff --git a/include/linux/mfd/max8925.h b/include/linux/mfd/max8925.h
index 5259dfe8c585..b8e6d9449086 100644
--- a/include/linux/mfd/max8925.h
+++ b/include/linux/mfd/max8925.h
@@ -167,9 +167,6 @@ enum {
         MAX8925_IRQ_VCHG_DC_OVP,
         MAX8925_IRQ_VCHG_DC_F,
         MAX8925_IRQ_VCHG_DC_R,
-        MAX8925_IRQ_VCHG_USB_OVP,
-        MAX8925_IRQ_VCHG_USB_F,
-        MAX8925_IRQ_VCHG_USB_R,
         MAX8925_IRQ_VCHG_THM_OK_R,
         MAX8925_IRQ_VCHG_THM_OK_F,
         MAX8925_IRQ_VCHG_SYSLOW_F,
@@ -223,6 +220,10 @@ struct max8925_power_pdata {
         unsigned        batt_detect:1;
         unsigned        topoff_threshold:2;
         unsigned        fast_charge:3;  /* charge current */
+        unsigned        no_temp_support:1; /* set if no temperature detect */
+        unsigned        no_insert_detect:1; /* set if no ac insert detect */
+        char            **supplied_to;
+        int             num_supplicants;
 };
 
 /*