projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'perf/urgent' into perf/core, to resolve a conflict
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
thermal
/
spear_thermal.c
diff --git
a/drivers/thermal/spear_thermal.c
b/drivers/thermal/spear_thermal.c
index bddb71744a6c4d9dbca8cea5e6eb4121f41b7798..534dd913666283fa13eecfaeb8823ea3d55ac0c8 100644
(file)
--- a/
drivers/thermal/spear_thermal.c
+++ b/
drivers/thermal/spear_thermal.c
@@
-38,7
+38,7
@@
struct spear_thermal_dev {
};
static inline int thermal_get_temp(struct thermal_zone_device *thermal,
-
unsigned long
*temp)
+
int
*temp)
{
struct spear_thermal_dev *stdev = thermal->devdata;