-
由 Anton Vorontsov 提交于
commit 0848c94f ("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 a830d28b ("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: NStephen Rothwell <sfr@canb.auug.org.au> Reported-by: NFengguang Wu <fengguang.wu@intel.com> Reported-by: NSamuel Ortiz <sameo@linux.intel.com> Signed-off-by: NAnton Vorontsov <anton.vorontsov@linaro.org>
18766f09