Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6

[linux-2.6-omap-h63xx.git] / Documentation / hwmon / sysfs-interface

diff --git a/Documentation/hwmon/sysfs-interface b/Documentation/hwmon/sysfs-interface
index d131a56e52f8e3dca6ca84280897fd74d617e470..b3a9e1b9dbda9458b5d4215f50b3b217284c3b82 100644 (file)
--- a/Documentation/hwmon/sysfs-interface
+++ b/Documentation/hwmon/sysfs-interface
@@ -172,11 +172,10 @@ pwm[1-*]  Pulse width modulation fan control.
                255 is max or 100%.
 
 pwm[1-*]_enable
-               Switch PWM on and off.
-               Not always present even if pwmN is.
-               0: turn off
-               1: turn on in manual mode
-               2+: turn on in automatic mode
+               Fan speed control method:
+               0: no fan speed control (i.e. fan at full speed)
+               1: manual fan speed control enabled (using pwm[1-*])
+               2+: automatic fan speed control enabled
                Check individual chip documentation files for automatic mode
                details.
                RW