From 12b4b44375f5a1b57a1cdfc6f1e90f5256d915f9 Mon Sep 17 00:00:00 2001 From: Rhyland Klein Date: Mon, 28 Feb 2011 16:55:31 -0800 Subject: [PATCH] --- yaml --- r: 242591 b: refs/heads/master c: 35c9d267665230cf44445be616d491d3763a5cd3 h: refs/heads/master i: 242589: 24c7932820dcaee3db57b028555ca794a761e2e8 242587: 00325f9ae5926cad2811891d361104f4a846c3fe 242583: 14148ea07e8843607e586695963fcbf4d9e1af80 242575: 9397d4bd265b8bbef10bfaf4ef525613d187f4a1 242559: c88e0648c470f260beb76d6873e4b3783768450b v: v3 --- [refs] | 2 +- trunk/include/linux/power_supply.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index cc08ec919978..59595a916c57 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ff28fcef1bedcfbdf49500fee1573dc2f3eedb22 +refs/heads/master: 35c9d267665230cf44445be616d491d3763a5cd3 diff --git a/trunk/include/linux/power_supply.h b/trunk/include/linux/power_supply.h index 20f23fef63cc..204c18dfdc9e 100644 --- a/trunk/include/linux/power_supply.h +++ b/trunk/include/linux/power_supply.h @@ -251,6 +251,7 @@ static inline bool power_supply_is_watt_property(enum power_supply_property psp) case POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN: case POWER_SUPPLY_PROP_VOLTAGE_NOW: case POWER_SUPPLY_PROP_VOLTAGE_AVG: + case POWER_SUPPLY_PROP_POWER_NOW: return 1; default: break;