diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-03-19 20:02:01 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-03-19 20:02:01 -0400 |
| commit | 10ce3cc919f50c2043b41ca968b43c26a3672600 (patch) | |
| tree | ea409366a5208aced495bc0516a08b81fd43222e /Documentation/hwmon/sysfs-interface | |
| parent | 24e3e5ae1e4c2a3a32f5b1f96b4e3fd721806acd (diff) | |
| parent | 5c6a7a62c130afef3d61c1dee153012231ff5cd9 (diff) | |
Merge branch 'next' into for-linus
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 a4aa8f600e09..1f4dd855a299 100644 --- a/Documentation/hwmon/sysfs-interface +++ b/Documentation/hwmon/sysfs-interface | |||
| @@ -304,7 +304,7 @@ value (fastest fan speed) wins. | |||
| 304 | temp[1-*]_type Sensor type selection. | 304 | temp[1-*]_type Sensor type selection. |
| 305 | Integers 1 to 6 | 305 | Integers 1 to 6 |
| 306 | RW | 306 | RW |
| 307 | 1: PII/Celeron Diode | 307 | 1: CPU embedded diode |
| 308 | 2: 3904 transistor | 308 | 2: 3904 transistor |
| 309 | 3: thermal diode | 309 | 3: thermal diode |
| 310 | 4: thermistor | 310 | 4: thermistor |