diff options
| author | Len Brown <len.brown@intel.com> | 2009-12-15 22:35:50 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-12-15 22:35:50 -0500 |
| commit | 1667e399a41be976c9d37bf02aa477979df111d2 (patch) | |
| tree | 9b412df956905afecc15753628b608c06f9b11d7 /drivers/acpi | |
| parent | abdef01daceb120ef8cc03fbc96d5e029e2810b0 (diff) | |
| parent | 3767cb54ac718eb049d2a29f7a575ab923550ba5 (diff) | |
Merge branch 'thermal-2.6.33' into release
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/thermal.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c index 65f67815902a..9073ada88835 100644 --- a/drivers/acpi/thermal.c +++ b/drivers/acpi/thermal.c | |||
| @@ -1052,6 +1052,13 @@ static int acpi_thermal_trip_seq_show(struct seq_file *seq, void *offset) | |||
| 1052 | acpi_device_bid(device)); | 1052 | acpi_device_bid(device)); |
| 1053 | } | 1053 | } |
| 1054 | seq_puts(seq, "\n"); | 1054 | seq_puts(seq, "\n"); |
| 1055 | } else { | ||
| 1056 | seq_printf(seq, "passive (forced):"); | ||
| 1057 | if (tz->thermal_zone->forced_passive) | ||
| 1058 | seq_printf(seq, " %i C\n", | ||
| 1059 | tz->thermal_zone->forced_passive / 1000); | ||
| 1060 | else | ||
| 1061 | seq_printf(seq, "<not set>\n"); | ||
| 1055 | } | 1062 | } |
| 1056 | 1063 | ||
| 1057 | for (i = 0; i < ACPI_THERMAL_MAX_ACTIVE; i++) { | 1064 | for (i = 0; i < ACPI_THERMAL_MAX_ACTIVE; i++) { |