diff options
| author | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
| commit | d4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch) | |
| tree | eefd82c155bc27469a85667d759cd90facf4a6e3 /Documentation/hwmon/sysfs-interface | |
| parent | c0fa797ae6cd02ff87c0bfe0d509368a3b45640e (diff) | |
| parent | 96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff) | |
Merge branch 'master'; commit 'v2.6.39-rc3' into next
Diffstat (limited to 'Documentation/hwmon/sysfs-interface')
| -rw-r--r-- | Documentation/hwmon/sysfs-interface | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/hwmon/sysfs-interface b/Documentation/hwmon/sysfs-interface index 83a698773ade..8f63c244f1aa 100644 --- a/Documentation/hwmon/sysfs-interface +++ b/Documentation/hwmon/sysfs-interface | |||
| @@ -579,7 +579,7 @@ channel should not be trusted. | |||
| 579 | fan[1-*]_fault | 579 | fan[1-*]_fault |
| 580 | temp[1-*]_fault | 580 | temp[1-*]_fault |
| 581 | Input fault condition | 581 | Input fault condition |
| 582 | 0: no fault occured | 582 | 0: no fault occurred |
| 583 | 1: fault condition | 583 | 1: fault condition |
| 584 | RO | 584 | RO |
| 585 | 585 | ||