---

yaml --- r: 110245 b: refs/heads/master c: ddedc65 h: refs/heads/master i: 110243: 18f8042 v: v3
git-mirror · Oct 9, 2008 · ed9c69c · ed9c69c
1 parent 9c1826e
commit ed9c69c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 98dd22c3e086d76058083432d4d8fb85f04bab90
+refs/heads/master: ddedc658fc56bb5b9b200d7f4df6e93e1d0d8048
diff --git a/trunk/Documentation/hwmon/sysfs-interface b/trunk/Documentation/hwmon/sysfs-interface
@@ -329,6 +329,10 @@ power[1-*]_average		Average power use
 				Unit: microWatt
 				RO
 
+power[1-*]_average_interval	Power use averaging interval
+				Unit: milliseconds
+				RW
+
 power[1-*]_average_highest	Historical average maximum power use
 				Unit: microWatt
 				RO
@@ -353,6 +357,14 @@ power[1-*]_reset_history	Reset input_highest, input_lowest,
 				average_highest and average_lowest.
 				WO
 
+**********
+* Energy *
+**********
+
+energy[1-*]_input		Cumulative energy use
+				Unit: microJoule
+				RO
+
 **********
 * Alarms *
 **********