diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-02-25 18:42:08 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-02-25 18:42:08 -0800 |
| commit | 1ebe3839e66ae85e065157ba9d6f7923ad8d8fbf (patch) | |
| tree | 8ed65e1922a16eda1c7ae800da46ac2758774472 /include | |
| parent | 6dc390ad61ac8dfca5fa9b0823981fb6f7ec17a0 (diff) | |
| parent | 9aafabc7fece13c8e2a1f680908c73ee19f0f79b (diff) | |
Merge tag 'for-v4.5-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply
Pull power supply fixes from Sebastian Reichel:
"Add a regression fix for changed sysfs path of bq27xxx_battery and
update MAINTAINERS file"
* tag 'for-v4.5-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply:
power: bq27xxx_battery: Restore device name
MAINTAINERS: update bq27xxx driver
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/power/bq27xxx_battery.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/power/bq27xxx_battery.h b/include/linux/power/bq27xxx_battery.h index 998d8f1c3c91..b50c0492629d 100644 --- a/include/linux/power/bq27xxx_battery.h +++ b/include/linux/power/bq27xxx_battery.h @@ -49,6 +49,7 @@ struct bq27xxx_reg_cache { struct bq27xxx_device_info { struct device *dev; + int id; enum bq27xxx_chip chip; const char *name; struct bq27xxx_access_methods bus; |