From: Sascha Silbe Date: Wed, 12 Jan 2011 22:23:23 +0000 (+0100) Subject: olpc_battery: Fix up XO-1.5 properties list X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=bf542a4e7b634c2adcba4241a29082f69b0f45dc;p=linux-beck.git 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 Signed-off-by: Anton Vorontsov --- 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,