diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-08-07 02:36:12 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-08-07 02:36:12 -0400 |
| commit | 5e2aa2ed08e2e280121dc7cf5609c87d464f12ef (patch) | |
| tree | ca7d7b1480285e3b617fecc5b41f0ce150a82c32 /include/linux/power_supply.h | |
| parent | f62d14a8072b9756db36ba394e2b267470a40240 (diff) | |
| parent | fc8104bc5a3f6f49d79f45f2706f79f77a9fb2ae (diff) | |
Merge branch 'next' into for-linus
Prepare first round of input updates for 3.17.
Diffstat (limited to 'include/linux/power_supply.h')
| -rw-r--r-- | include/linux/power_supply.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h index c9dc4e09854c..f2b76aeaf4e4 100644 --- a/include/linux/power_supply.h +++ b/include/linux/power_supply.h | |||
| @@ -264,6 +264,8 @@ static inline int power_supply_is_system_supplied(void) { return -ENOSYS; } | |||
| 264 | 264 | ||
| 265 | extern int power_supply_register(struct device *parent, | 265 | extern int power_supply_register(struct device *parent, |
| 266 | struct power_supply *psy); | 266 | struct power_supply *psy); |
| 267 | extern int power_supply_register_no_ws(struct device *parent, | ||
| 268 | struct power_supply *psy); | ||
| 267 | extern void power_supply_unregister(struct power_supply *psy); | 269 | extern void power_supply_unregister(struct power_supply *psy); |
| 268 | extern int power_supply_powers(struct power_supply *psy, struct device *dev); | 270 | extern int power_supply_powers(struct power_supply *psy, struct device *dev); |
| 269 | 271 | ||