Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[mv-sheeva.git] / Documentation / thermal / sysfs-api.txt

diff --git a/Documentation/thermal/sysfs-api.txt b/Documentation/thermal/sysfs-api.txt
index a87dc277a5ca4937bd3ebff2b7eeb829b6b9ee1a..cb3d15bc1aeb47f2d05f00394a176c01430568e8 100644 (file)
--- a/Documentation/thermal/sysfs-api.txt
+++ b/Documentation/thermal/sysfs-api.txt
@@ -206,6 +206,7 @@ passive
        passive trip point for the zone. Activation is done by polling with
        an interval of 1 second.
        Unit: millidegrees Celsius
+       Valid values: 0 (disabled) or greater than 1000
        RW, Optional
 
 *****************************