From aec49a43e08d34eedae1d8b4d87b8be05250212b Mon Sep 17 00:00:00 2001 From: Heikki Krogerus Date: Mon, 4 Oct 2010 10:51:38 +0300 Subject: [PATCH] --- yaml --- r: 217407 b: refs/heads/master c: fe3f6d097a042cff54bc1dc06f21ef528affe8ca h: refs/heads/master i: 217405: 4f8c9b00e8828b5eb50d4cb8e3ad9f4a421177f0 217403: 28688d6e9fdf56b97b9e2205ab82b0575838ff16 217399: a2802ce6026fb372ce68c78cbb1215aad90cdfdb 217391: 4dcefacfac2cf07ef95f399963105c7f797bea1e 217375: 00b12917213a584e472e679c8d947c43d3cc693a 217343: 76ec01a2a5ae56cda07bb0727d29e737b47ae80c v: v3 --- [refs] | 2 +- trunk/drivers/power/power_supply_sysfs.c | 1 + trunk/include/linux/power_supply.h | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index e88d6cb3e98a..a3d34230366d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 85efc8a18cedf70e55acd0c825e2d9d2f3b19999 +refs/heads/master: fe3f6d097a042cff54bc1dc06f21ef528affe8ca diff --git a/trunk/drivers/power/power_supply_sysfs.c b/trunk/drivers/power/power_supply_sysfs.c index 88f5e43100c2..cd1f90754a3a 100644 --- a/trunk/drivers/power/power_supply_sysfs.c +++ b/trunk/drivers/power/power_supply_sysfs.c @@ -139,6 +139,7 @@ static struct device_attribute power_supply_attrs[] = { POWER_SUPPLY_ATTR(voltage_min_design), POWER_SUPPLY_ATTR(voltage_now), POWER_SUPPLY_ATTR(voltage_avg), + POWER_SUPPLY_ATTR(current_max), POWER_SUPPLY_ATTR(current_now), POWER_SUPPLY_ATTR(current_avg), POWER_SUPPLY_ATTR(power_now), diff --git a/trunk/include/linux/power_supply.h b/trunk/include/linux/power_supply.h index d37fef67ece2..7d7325685c42 100644 --- a/trunk/include/linux/power_supply.h +++ b/trunk/include/linux/power_supply.h @@ -89,6 +89,7 @@ enum power_supply_property { POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN, POWER_SUPPLY_PROP_VOLTAGE_NOW, POWER_SUPPLY_PROP_VOLTAGE_AVG, + POWER_SUPPLY_PROP_CURRENT_MAX, POWER_SUPPLY_PROP_CURRENT_NOW, POWER_SUPPLY_PROP_CURRENT_AVG, POWER_SUPPLY_PROP_POWER_NOW,