diff options
| author | Sascha Silbe <sascha-pgp@silbe.org> | 2011-01-12 23:23:23 +0100 |
|---|---|---|
| committer | Anton Vorontsov <cbouatmailru@gmail.com> | 2011-01-13 01:41:57 +0300 |
| commit | bf542a4e7b634c2adcba4241a29082f69b0f45dc (patch) | |
| tree | 34b30d44ca244e5193273e8da10397c57bbb3933 /drivers | |
| parent | 22fadd766b2a222b273df9f2264b72e4b3bbe921 (diff) | |
| download | kernel-common-bf542a4e7b634c2adcba4241a29082f69b0f45dc.tar.gz kernel-common-bf542a4e7b634c2adcba4241a29082f69b0f45dc.tar.bz2 kernel-common-bf542a4e7b634c2adcba4241a29082f69b0f45dc.zip | |
olpc_battery: Fix up XO-1.5 properties list
The patches adding support for CURRENT_NOW, VOLTAGE_NOW, CHARGE_NOW and
CHARGE_FULL_DESIGN were based on a tree not including c566d299
("olpc_battery: Ambient temperature is not available on XO-1.5") and
therefore only modified the then-common, now-XO-1 properties list. This
patch adds the new properties to XO-1.5 as well.
Signed-off-by: Sascha Silbe <sascha-pgp@silbe.org>
Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/power/olpc_battery.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/power/olpc_battery.c b/drivers/power/olpc_battery.c index 64e40ff5c44a..0b0ff3a936a6 100644 --- a/drivers/power/olpc_battery.c +++ b/drivers/power/olpc_battery.c @@ -438,9 +438,13 @@ static enum power_supply_property olpc_xo15_bat_props[] = { POWER_SUPPLY_PROP_HEALTH, POWER_SUPPLY_PROP_TECHNOLOGY, POWER_SUPPLY_PROP_VOLTAGE_AVG, + POWER_SUPPLY_PROP_VOLTAGE_NOW, POWER_SUPPLY_PROP_CURRENT_AVG, + POWER_SUPPLY_PROP_CURRENT_NOW, POWER_SUPPLY_PROP_CAPACITY, POWER_SUPPLY_PROP_CAPACITY_LEVEL, + POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN, + POWER_SUPPLY_PROP_CHARGE_NOW, POWER_SUPPLY_PROP_TEMP, POWER_SUPPLY_PROP_MANUFACTURER, POWER_SUPPLY_PROP_SERIAL_NUMBER, |