diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-01 15:03:09 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-01 15:03:09 (GMT) |
| commit | d9244b5d2fbfe9fa540024b410047af13ceec90f (patch) | |
| tree | d0fd7ce9146e89685d7fe2ee543450df83a0024f /Documentation | |
| parent | 65039a31f4e44630f96f1b602c43cc8ad180d4fe (diff) | |
| parent | d54d462472a16fc07adb53a2fcd6c0c2a9a8dd1d (diff) | |
| download | linux-fsl-qoriq-d9244b5d2fbfe9fa540024b410047af13ceec90f.tar.xz | |
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
hwmon: Update documentation on fan_max
hwmon: (lm78) Add missing __devexit_p()
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/hwmon/sysfs-interface | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/hwmon/sysfs-interface b/Documentation/hwmon/sysfs-interface index 2f10ce6..004ee16 100644 --- a/Documentation/hwmon/sysfs-interface +++ b/Documentation/hwmon/sysfs-interface @@ -150,6 +150,11 @@ fan[1-*]_min Fan minimum value Unit: revolution/min (RPM) RW +fan[1-*]_max Fan maximum value + Unit: revolution/min (RPM) + Only rarely supported by the hardware. + RW + fan[1-*]_input Fan input value. Unit: revolution/min (RPM) RO @@ -390,6 +395,7 @@ OR in[0-*]_min_alarm in[0-*]_max_alarm fan[1-*]_min_alarm +fan[1-*]_max_alarm temp[1-*]_min_alarm temp[1-*]_max_alarm temp[1-*]_crit_alarm |