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 /include/linux/power_supply.h | |
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 'include/linux/power_supply.h')
-rw-r--r-- | include/linux/power_supply.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h index 594c494ac3f0..0ab6aa171241 100644 --- a/include/linux/power_supply.h +++ b/include/linux/power_supply.h | |||
@@ -58,6 +58,15 @@ enum { | |||
58 | POWER_SUPPLY_TECHNOLOGY_LiMn, | 58 | POWER_SUPPLY_TECHNOLOGY_LiMn, |
59 | }; | 59 | }; |
60 | 60 | ||
61 | enum { | ||
62 | POWER_SUPPLY_CAPACITY_LEVEL_UNKNOWN = 0, | ||
63 | POWER_SUPPLY_CAPACITY_LEVEL_CRITICAL, | ||
64 | POWER_SUPPLY_CAPACITY_LEVEL_LOW, | ||
65 | POWER_SUPPLY_CAPACITY_LEVEL_NORMAL, | ||
66 | POWER_SUPPLY_CAPACITY_LEVEL_HIGH, | ||
67 | POWER_SUPPLY_CAPACITY_LEVEL_FULL, | ||
68 | }; | ||
69 | |||
61 | enum power_supply_property { | 70 | enum power_supply_property { |
62 | /* Properties of type `int' */ | 71 | /* Properties of type `int' */ |
63 | POWER_SUPPLY_PROP_STATUS = 0, | 72 | POWER_SUPPLY_PROP_STATUS = 0, |
@@ -89,6 +98,7 @@ enum power_supply_property { | |||
89 | POWER_SUPPLY_PROP_ENERGY_NOW, | 98 | POWER_SUPPLY_PROP_ENERGY_NOW, |
90 | POWER_SUPPLY_PROP_ENERGY_AVG, | 99 | POWER_SUPPLY_PROP_ENERGY_AVG, |
91 | POWER_SUPPLY_PROP_CAPACITY, /* in percents! */ | 100 | POWER_SUPPLY_PROP_CAPACITY, /* in percents! */ |
101 | POWER_SUPPLY_PROP_CAPACITY_LEVEL, | ||
92 | POWER_SUPPLY_PROP_TEMP, | 102 | POWER_SUPPLY_PROP_TEMP, |
93 | POWER_SUPPLY_PROP_TEMP_AMBIENT, | 103 | POWER_SUPPLY_PROP_TEMP_AMBIENT, |
94 | POWER_SUPPLY_PROP_TIME_TO_EMPTY_NOW, | 104 | POWER_SUPPLY_PROP_TIME_TO_EMPTY_NOW, |