aboutsummaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2015-05-25 21:00:24 +1000
committerLinus Torvalds <torvalds@linux-foundation.org>2015-06-26 17:44:09 -0700
commit4b703b1d4c46ca4a00109ca1a391943ec21991b3 (patch)
treed219cb12b036a291c68fc278452702b9c9219f3b /init
parentMerge tag 'dma-buf-for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/sumits/dma-buf (diff)
downloadlinux-dev-4b703b1d4c46ca4a00109ca1a391943ec21991b3.tar.xz
linux-dev-4b703b1d4c46ca4a00109ca1a391943ec21991b3.zip
power: axp288_charger: fix for API change
Caused by commit 843735b788a4 ("power: axp288_charger: axp288 charger driver") from the battery tree interacting with commit 046050f6e623 ("extcon: Update the prototype of extcon_register_notifier() with enum extcon") from the extcon tree. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'init')
0 files changed, 0 insertions, 0 deletions