diff options
| author | Zhang Rui <rui.zhang@intel.com> | 2013-02-06 14:02:12 +0800 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2013-02-06 14:13:56 +0800 |
| commit | 5e20b2e51dd13c569ea1ff65c2a57d00a84a81b0 (patch) | |
| tree | 5abc06b25b50e67e0ebb8ac962a7fb4a84f8f3b5 /drivers/thermal | |
| parent | 475f41c3ab3dea3a5c60b90197baf57da01fdb5f (diff) | |
| download | linux-stable-5e20b2e51dd13c569ea1ff65c2a57d00a84a81b0.tar.gz linux-stable-5e20b2e51dd13c569ea1ff65c2a57d00a84a81b0.tar.bz2 linux-stable-5e20b2e51dd13c569ea1ff65c2a57d00a84a81b0.zip | |
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.c | 5 |
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) 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); |