From 61f5380c3e71282d795829f54a6527bc99134e49 Mon Sep 17 00:00:00 2001
From: Frans Pop <elendil@planet.nl>
Date: Tue, 17 Nov 2009 14:27:33 -0800
Subject: [PATCH] --- yaml --- r: 177602 b: refs/heads/master c:
 bf2abdd79ac81c52957bf0d0d5430cec5433cfb7 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/acpi/thermal.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index da7f051f0b58..9e7f26afddd5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b552a8c56db8a74ceffdcbb9269664009a81d536
+refs/heads/master: bf2abdd79ac81c52957bf0d0d5430cec5433cfb7
diff --git a/trunk/drivers/acpi/thermal.c b/trunk/drivers/acpi/thermal.c
index 65f67815902a..9073ada88835 100644
--- a/trunk/drivers/acpi/thermal.c
+++ b/trunk/drivers/acpi/thermal.c
@@ -1052,6 +1052,13 @@ static int acpi_thermal_trip_seq_show(struct seq_file *seq, void *offset)
 				   acpi_device_bid(device));
 		}
 		seq_puts(seq, "\n");
+	} else {
+		seq_printf(seq, "passive (forced):");
+		if (tz->thermal_zone->forced_passive)
+			seq_printf(seq, "        %i C\n",
+				   tz->thermal_zone->forced_passive / 1000);
+		else
+			seq_printf(seq, "<not set>\n");
 	}
 
 	for (i = 0; i < ACPI_THERMAL_MAX_ACTIVE; i++) {