summaryrefslogtreecommitdiffstats
path: root/drivers/power/ab8500_fg.c
diff options
context:
space:
mode:
authorAnton Vorontsov <anton.vorontsov@linaro.org>2012-09-25 04:10:08 +0200
committerAnton Vorontsov <anton.vorontsov@linaro.org>2012-09-25 04:12:01 +0200
commit18766f0936d444fd7ff2e0064bd6e69a89d5c6fc (patch)
treeb3e44515085c6d52747f25d57fa63e915b569c29 /drivers/power/ab8500_fg.c
parentpda_power: Remove ac_draw_failed goto and label (diff)
parentmfd: core: Push irqdomain mapping out into devices (diff)
downloadlinux-18766f0936d444fd7ff2e0064bd6e69a89d5c6fc.tar.xz
linux-18766f0936d444fd7ff2e0064bd6e69a89d5c6fc.zip
Merge with upstream to accommodate with MFD changes
commit 0848c94fb4 ("mfd: core: Push irqdomain mapping out into devices") that appeared in v3.6-rc6 adds another argument to the mfd_add_devices() call, and that makes commit a830d28b48bf ("power_supply: Enable battery-charger for 88pm860x", which is battery tree) no longer compatible with the latest kernels. This commit is used to merge upstream back into battery tree and accommodate 88pm860x driver for the latest changes in MFD core. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Reported-by: Fengguang Wu <fengguang.wu@intel.com> Reported-by: Samuel Ortiz <sameo@linux.intel.com> Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>
Diffstat (limited to 'drivers/power/ab8500_fg.c')
0 files changed, 0 insertions, 0 deletions