aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2009-12-15 22:35:50 -0500
committerLen Brown <len.brown@intel.com>2009-12-15 22:35:50 -0500
commit1667e399a41be976c9d37bf02aa477979df111d2 (patch)
tree9b412df956905afecc15753628b608c06f9b11d7 /Documentation
parentabdef01daceb120ef8cc03fbc96d5e029e2810b0 (diff)
parent3767cb54ac718eb049d2a29f7a575ab923550ba5 (diff)
Merge branch 'thermal-2.6.33' into release
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/thermal/sysfs-api.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/thermal/sysfs-api.txt b/Documentation/thermal/sysfs-api.txt
index a87dc277a5ca..cb3d15bc1aeb 100644
--- a/Documentation/thermal/sysfs-api.txt
+++ b/Documentation/thermal/sysfs-api.txt
@@ -206,6 +206,7 @@ passive
206 passive trip point for the zone. Activation is done by polling with 206 passive trip point for the zone. Activation is done by polling with
207 an interval of 1 second. 207 an interval of 1 second.
208 Unit: millidegrees Celsius 208 Unit: millidegrees Celsius
209 Valid values: 0 (disabled) or greater than 1000
209 RW, Optional 210 RW, Optional
210 211
211***************************** 212*****************************