From dc57aeeb5a4dba59b607a09d1afd971755cb553e Mon Sep 17 00:00:00 2001
From: Guenter Roeck <guenter.roeck@ericsson.com>
Date: Sat, 14 Aug 2010 21:08:53 +0200
Subject: [PATCH] --- yaml --- r: 209425 b: refs/heads/master c:
 e04a715e4e1210a6ecfcaa0e6ceefde07020710b h: refs/heads/master i:   209423:
 0b7a4c4a539bb343752742471ac080ca30710373 v: v3

---
 [refs]                                    | 2 +-
 trunk/Documentation/hwmon/sysfs-interface | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 136c653e275e..fe90bbe25e5c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f46fc8cd382f318a7d9c6cd0af1b771c74e5dfd0
+refs/heads/master: e04a715e4e1210a6ecfcaa0e6ceefde07020710b
diff --git a/trunk/Documentation/hwmon/sysfs-interface b/trunk/Documentation/hwmon/sysfs-interface
index 2e492187a665..d4d175b8a54a 100644
--- a/trunk/Documentation/hwmon/sysfs-interface
+++ b/trunk/Documentation/hwmon/sysfs-interface
@@ -363,9 +363,6 @@ Also see the Alarms section for status flags associated with temperatures.
 * Currents *
 ************
 
-Note that no known chip provides current measurements as of writing,
-so this part is theoretical, so to say.
-
 curr[1-*]_max	Current max value
 		Unit: milliampere
 		RW
@@ -490,6 +487,7 @@ limit-related alarms, not both. The driver should just reflect the hardware
 implementation.
 
 in[0-*]_alarm
+curr[1-*]_alarm
 fan[1-*]_alarm
 temp[1-*]_alarm
 		Channel alarm
@@ -501,6 +499,8 @@ OR
 
 in[0-*]_min_alarm
 in[0-*]_max_alarm
+curr[1-*]_min_alarm
+curr[1-*]_max_alarm
 fan[1-*]_min_alarm
 fan[1-*]_max_alarm
 temp[1-*]_min_alarm
@@ -532,6 +532,7 @@ beep_enable	Master beep enable
 		RW
 
 in[0-*]_beep
+curr[1-*]_beep
 fan[1-*]_beep
 temp[1-*]_beep
 		Channel beep