diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-09-01 10:53:15 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-09-01 10:53:15 +1000 |
| commit | 4529398e8b45431ae164b414da330c834254fc52 (patch) | |
| tree | 3f3846d0566bf18aa69f803e6da1ddcbac10d039 /Documentation | |
| parent | b1a8139d7f96b81885a43930df1c5a76e2faf4f7 (diff) | |
| parent | 4b0e3bbdc606b2b8e62d217fcf3e91a43e0c1383 (diff) | |
Merge branch 'quilt/jdelvare-hwmon'
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/hwmon/sysfs-interface | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/hwmon/sysfs-interface b/Documentation/hwmon/sysfs-interface index ff45d1f837c8..101300bd4629 100644 --- a/Documentation/hwmon/sysfs-interface +++ b/Documentation/hwmon/sysfs-interface @@ -310,6 +310,13 @@ temp[1-*]_crit_hyst from the critical value. RW +temp[1-*]_emergency + Temperature emergency max value, for chips supporting more than + two upper temperature limits. Must be equal or greater than + corresponding temp_crit values. + Unit: millidegree Celsius + RW + temp[1-*]_lcrit Temperature critical min value, typically lower than corresponding temp_min values. Unit: millidegree Celsius |