diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-01-26 13:06:02 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-01-26 13:06:02 +1100 |
| commit | 826a0951306658ba07193ca07f84504fce028cbd (patch) | |
| tree | 3131ab0162a5484455fcf8dd6aff5429dab60cba /include | |
| parent | 81555e440128c3bcbb252cb61cdaedad23487755 (diff) | |
| parent | adbdb17421b66d90c9423e0c59578331da09a7a1 (diff) | |
Merge commit 'acpi/test'
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 8ff25e0e7f7a..594c494ac3f0 100644 --- a/include/linux/power_supply.h +++ b/include/linux/power_supply.h @@ -73,6 +73,8 @@ enum power_supply_property { POWER_SUPPLY_PROP_VOLTAGE_AVG, POWER_SUPPLY_PROP_CURRENT_NOW, POWER_SUPPLY_PROP_CURRENT_AVG, + POWER_SUPPLY_PROP_POWER_NOW, + POWER_SUPPLY_PROP_POWER_AVG, POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN, POWER_SUPPLY_PROP_CHARGE_EMPTY_DESIGN, POWER_SUPPLY_PROP_CHARGE_FULL, |