projects
/
kernel
/
kernel-generic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
475f41c
)
Thermal: fix a build warning when CONFIG_THERMAL_EMULATION cleared
author
Zhang Rui
<rui.zhang@intel.com>
Wed, 6 Feb 2013 06:02:12 +0000
(14:02 +0800)
committer
Zhang Rui
<rui.zhang@intel.com>
Wed, 6 Feb 2013 06:13:56 +0000
(14:13 +0800)
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
drivers/thermal/thermal_sys.c
patch
|
blob
|
history
diff --git
a/drivers/thermal/thermal_sys.c
b/drivers/thermal/thermal_sys.c
index
0675687
..
6472e7e
100644
(file)
--- 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);