diff options
| author | Len Brown <len.brown@intel.com> | 2009-04-05 07:39:26 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-04-05 07:39:26 +0200 |
| commit | 3266d63c0684138f4900d4e5c6fbfab59e054afc (patch) | |
| tree | 83b67cc2dca6dfb25e81ff21716fdd4c56b39623 /include | |
| parent | Merge branch 'hp-wmi' into release (diff) | |
| parent | ACPI: battery: add power_{now,avg} properties to power_class (diff) | |
| download | linux-3266d63c0684138f4900d4e5c6fbfab59e054afc.tar.xz linux-3266d63c0684138f4900d4e5c6fbfab59e054afc.zip | |
Merge branch 'battery' into release
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, |