aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/thermal
diff options
context:
space:
mode:
authorZhang Rui <rui.zhang@intel.com>2013-02-06 01:02:12 -0500
committerZhang Rui <rui.zhang@intel.com>2013-02-06 01:13:56 -0500
commit5e20b2e51dd13c569ea1ff65c2a57d00a84a81b0 (patch)
tree5abc06b25b50e67e0ebb8ac962a7fb4a84f8f3b5 /drivers/thermal
parent475f41c3ab3dea3a5c60b90197baf57da01fdb5f (diff)
Thermal: fix a build warning when CONFIG_THERMAL_EMULATION cleared
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Diffstat (limited to 'drivers/thermal')
-rw-r--r--drivers/thermal/thermal_sys.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/thermal/thermal_sys.c b/drivers/thermal/thermal_sys.c
index 0675687c6de8..6472e7e9f969 100644
--- a/drivers/thermal/thermal_sys.c
+++ b/drivers/thermal/thermal_sys.c
@@ -381,9 +381,12 @@ static void handle_thermal_trip(struct thermal_zone_device *tz, int trip)
381static int thermal_zone_get_temp(struct thermal_zone_device *tz, 381static int thermal_zone_get_temp(struct thermal_zone_device *tz,
382 unsigned long *temp) 382 unsigned long *temp)
383{ 383{
384 int ret = 0, count; 384 int ret = 0;
385#ifdef CONFIG_THERMAL_EMULATION
386 int count;
385 unsigned long crit_temp = -1UL; 387 unsigned long crit_temp = -1UL;
386 enum thermal_trip_type type; 388 enum thermal_trip_type type;
389#endif
387 390
388 mutex_lock(&tz->lock); 391 mutex_lock(&tz->lock);
389 392