diff --git a/[refs] b/[refs]
index 98001981111a..dda17a3a1478 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 475f41c3ab3dea3a5c60b90197baf57da01fdb5f
+refs/heads/master: 5e20b2e51dd13c569ea1ff65c2a57d00a84a81b0
diff --git a/trunk/drivers/thermal/thermal_sys.c b/trunk/drivers/thermal/thermal_sys.c
index 0675687c6de8..6472e7e9f969 100644
--- a/trunk/drivers/thermal/thermal_sys.c
+++ b/trunk/drivers/thermal/thermal_sys.c
@@ -381,9 +381,12 @@ static void handle_thermal_trip(struct thermal_zone_device *tz, int trip)
 static int thermal_zone_get_temp(struct thermal_zone_device *tz,
 				unsigned long *temp)
 {
-	int ret = 0, count;
+	int ret = 0;
+#ifdef CONFIG_THERMAL_EMULATION
+	int count;
 	unsigned long crit_temp = -1UL;
 	enum thermal_trip_type type;
+#endif
 
 	mutex_lock(&tz->lock);