diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-02-11 12:52:51 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-02-11 12:52:51 +1100 |
| commit | a0bebe0c3f03a71b4748fdac621b764eed36e347 (patch) | |
| tree | 00f248cbd847dea52c55ba16bede660774c61451 /include/linux | |
| parent | cc20f7fcbf60218ad3fed6550d27c31f05385db9 (diff) | |
| parent | 26db8646cadbbd2c095816f6a70cb308d6287c0c (diff) | |
Merge commit 'acpi/test'
Diffstat (limited to 'include/linux')
| -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, |