projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'microblaze-3.14-rc1' of git://git.monstr.eu/linux-2.6-microblaze
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
drivers
/
thermal
/
x86_pkg_temp_thermal.c
diff --git
a/drivers/thermal/x86_pkg_temp_thermal.c
b/drivers/thermal/x86_pkg_temp_thermal.c
index
7722cb9
..
972e1c7
100644
(file)
--- a/
drivers/thermal/x86_pkg_temp_thermal.c
+++ b/
drivers/thermal/x86_pkg_temp_thermal.c
@@
-215,7
+215,7
@@
static int sys_get_trip_temp(struct thermal_zone_device *tzd,
return 0;
}
-int sys_set_trip_temp(struct thermal_zone_device *tzd, int trip,
+
static
int sys_set_trip_temp(struct thermal_zone_device *tzd, int trip,
unsigned long temp)
{
u32 l, h;