diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /Documentation/hwmon/sysfs-interface | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
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 83a698773ad..8f63c244f1a 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 | ||