From bab1ad2c200eddee56a5d157612bb1b4e86a37e0 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Sun, 8 Jan 2012 19:34:05 +0100 Subject: [PATCH] --- yaml --- r: 292111 b: refs/heads/master c: 0910b28ef44a0ef3653ac6a10ee8eab0acfe3f09 h: refs/heads/master i: 292109: 9fd46d6fd03dd2fb1c554d2d7a2128fa9c9b2040 292107: 70c5c37b0231451de79ece608ef5c3f4db1fcde6 292103: 9c9934f4df72ea99b029b7d14d3bbdf6586e3c44 292095: a23760d9ad29b1d6875e4cd6d4df29594150cfa2 v: v3 --- [refs] | 2 +- trunk/drivers/hwmon/ibmaem.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ae5f8f45f244..e72eca200af0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dcb7cb97bafff6c93b65626634f9c066436bf9d2 +refs/heads/master: 0910b28ef44a0ef3653ac6a10ee8eab0acfe3f09 diff --git a/trunk/drivers/hwmon/ibmaem.c b/trunk/drivers/hwmon/ibmaem.c index cc2981f749a6..37f17e0d9d5d 100644 --- a/trunk/drivers/hwmon/ibmaem.c +++ b/trunk/drivers/hwmon/ibmaem.c @@ -1045,7 +1045,7 @@ static struct aem_ro_sensor_template aem2_ro_sensors[] = { {"power6_average", aem2_show_pcap_value, POWER_CAP_MIN_WARNING}, {"power7_average", aem2_show_pcap_value, POWER_CAP_MIN}, -{"power3_average", aem2_show_pcap_value, POWER_AUX}, +{"power3_average", aem2_show_pcap_value, POWER_AUX}, {"power_cap", aem2_show_pcap_value, POWER_CAP}, {NULL, NULL, 0}, };