diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-06-04 01:11:30 +0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-06-04 01:11:30 +0400 |
| commit | f58c41cc0427115e3d750ec090020892acf0fb9c (patch) | |
| tree | 511fa5c1dd6bb2db1998acbee0bd16d75ae6e6c9 /include | |
| parent | ee7f9d7c7c1d0fde6441be495f6f14eae43af2e0 (diff) | |
| parent | e0d1f09e311fafa33b4bfd942c852671ce25ae58 (diff) | |
| download | linux-f58c41cc0427115e3d750ec090020892acf0fb9c.tar.xz | |
Merge branch 'acpi-battery'
* acpi-battery:
ACPI / battery: wakeup the system only when necessary
power_supply: allow power supply devices registered w/o wakeup source
ACPI / battery: introduce support for POWER_SUPPLY_PROP_CAPACITY_LEVEL
ACPI / battery: Accelerate battery resume callback
Diffstat (limited to 'include')
| -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; } extern int power_supply_register(struct device *parent, struct power_supply *psy); +extern int power_supply_register_no_ws(struct device *parent, + struct power_supply *psy); extern void power_supply_unregister(struct power_supply *psy); extern int power_supply_powers(struct power_supply *psy, struct device *dev); |