diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /Documentation/thermal | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'Documentation/thermal')
| -rw-r--r-- | Documentation/thermal/sysfs-api.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/thermal/sysfs-api.txt b/Documentation/thermal/sysfs-api.txt index a87dc277a5ca..cb3d15bc1aeb 100644 --- a/Documentation/thermal/sysfs-api.txt +++ b/Documentation/thermal/sysfs-api.txt | |||
| @@ -206,6 +206,7 @@ passive | |||
| 206 | passive trip point for the zone. Activation is done by polling with | 206 | passive trip point for the zone. Activation is done by polling with |
| 207 | an interval of 1 second. | 207 | an interval of 1 second. |
| 208 | Unit: millidegrees Celsius | 208 | Unit: millidegrees Celsius |
| 209 | Valid values: 0 (disabled) or greater than 1000 | ||
| 209 | RW, Optional | 210 | RW, Optional |
| 210 | 211 | ||
| 211 | ***************************** | 212 | ***************************** |