aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Silbe <sascha-pgp@silbe.org>2011-01-12 17:23:23 -0500
committerAnton Vorontsov <cbouatmailru@gmail.com>2011-01-12 17:41:57 -0500
commitbf542a4e7b634c2adcba4241a29082f69b0f45dc (patch)
tree34b30d44ca244e5193273e8da10397c57bbb3933
parent22fadd766b2a222b273df9f2264b72e4b3bbe921 (diff)
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>
-rw-r--r--drivers/power/olpc_battery.c4
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[] = {
438 POWER_SUPPLY_PROP_HEALTH, 438 POWER_SUPPLY_PROP_HEALTH,
439 POWER_SUPPLY_PROP_TECHNOLOGY, 439 POWER_SUPPLY_PROP_TECHNOLOGY,
440 POWER_SUPPLY_PROP_VOLTAGE_AVG, 440 POWER_SUPPLY_PROP_VOLTAGE_AVG,
441 POWER_SUPPLY_PROP_VOLTAGE_NOW,
441 POWER_SUPPLY_PROP_CURRENT_AVG, 442 POWER_SUPPLY_PROP_CURRENT_AVG,
443 POWER_SUPPLY_PROP_CURRENT_NOW,
442 POWER_SUPPLY_PROP_CAPACITY, 444 POWER_SUPPLY_PROP_CAPACITY,
443 POWER_SUPPLY_PROP_CAPACITY_LEVEL, 445 POWER_SUPPLY_PROP_CAPACITY_LEVEL,
446 POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN,
447 POWER_SUPPLY_PROP_CHARGE_NOW,
444 POWER_SUPPLY_PROP_TEMP, 448 POWER_SUPPLY_PROP_TEMP,
445 POWER_SUPPLY_PROP_MANUFACTURER, 449 POWER_SUPPLY_PROP_MANUFACTURER,
446 POWER_SUPPLY_PROP_SERIAL_NUMBER, 450 POWER_SUPPLY_PROP_SERIAL_NUMBER,