diff options
| author | Len Brown <len.brown@intel.com> | 2009-04-05 01:39:26 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-04-05 01:39:26 -0400 |
| commit | 3266d63c0684138f4900d4e5c6fbfab59e054afc (patch) | |
| tree | 83b67cc2dca6dfb25e81ff21716fdd4c56b39623 /include/linux | |
| parent | 4926a236396ffc82be004cc89223a7f2747a44dc (diff) | |
| parent | 7faa144a518c456e2057918f030f50100144ccc6 (diff) | |
Merge branch 'battery' into release
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 { | |||
| 73 | POWER_SUPPLY_PROP_VOLTAGE_AVG, | 73 | POWER_SUPPLY_PROP_VOLTAGE_AVG, |
| 74 | POWER_SUPPLY_PROP_CURRENT_NOW, | 74 | POWER_SUPPLY_PROP_CURRENT_NOW, |
| 75 | POWER_SUPPLY_PROP_CURRENT_AVG, | 75 | POWER_SUPPLY_PROP_CURRENT_AVG, |
| 76 | POWER_SUPPLY_PROP_POWER_NOW, | ||
| 77 | POWER_SUPPLY_PROP_POWER_AVG, | ||
| 76 | POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN, | 78 | POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN, |
| 77 | POWER_SUPPLY_PROP_CHARGE_EMPTY_DESIGN, | 79 | POWER_SUPPLY_PROP_CHARGE_EMPTY_DESIGN, |
| 78 | POWER_SUPPLY_PROP_CHARGE_FULL, | 80 | POWER_SUPPLY_PROP_CHARGE_FULL, |