diff options
| author | Andres Salomon <dilinger@collabora.co.uk> | 2009-06-30 02:13:01 -0400 |
|---|---|---|
| committer | Anton Vorontsov <cbouatmailru@gmail.com> | 2009-06-30 18:44:03 -0400 |
| commit | b294a290d24d1196d68399cc3a9b8c50bfb55abd (patch) | |
| tree | 6d8b2ec03c90bfc4ba3c478af9bfbd0e49b1b45a /Documentation/power | |
| parent | bfdb46ce8494eae30dbaae65c81e684e6db6228b (diff) | |
Revert "power: remove POWER_SUPPLY_PROP_CAPACITY_LEVEL"
This reverts commit 8efe444038a205e79b38b7ad03878824901849a8 and
4cbc76eadf56399cd11fb736b33c53aec9caab8c.
Richard@laptop.org was apparently using CAPACITY_LEVEL for debugging
battery/EC problems, and was upset that it was removed. This readds it.
Conflicts:
Documentation/power_supply_class.txt
Signed-off-by: Andres Salomon <dilinger@collabora.co.uk>
Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com>
Diffstat (limited to 'Documentation/power')
| -rw-r--r-- | Documentation/power/power_supply_class.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/power/power_supply_class.txt b/Documentation/power/power_supply_class.txt index c6cd4956047c..709d95571d7b 100644 --- a/Documentation/power/power_supply_class.txt +++ b/Documentation/power/power_supply_class.txt | |||
| @@ -108,6 +108,8 @@ relative, time-based measurements. | |||
| 108 | ENERGY_FULL, ENERGY_EMPTY - same as above but for energy. | 108 | ENERGY_FULL, ENERGY_EMPTY - same as above but for energy. |
| 109 | 109 | ||
| 110 | CAPACITY - capacity in percents. | 110 | CAPACITY - capacity in percents. |
| 111 | CAPACITY_LEVEL - capacity level. This corresponds to | ||
| 112 | POWER_SUPPLY_CAPACITY_LEVEL_*. | ||
| 111 | 113 | ||
| 112 | TEMP - temperature of the power supply. | 114 | TEMP - temperature of the power supply. |
| 113 | TEMP_AMBIENT - ambient temperature. | 115 | TEMP_AMBIENT - ambient temperature. |