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;