Linus Torvalds dfb22fc5c0 thermal: fix intel PCH thermal driver mismerge ... I didn't notice this when merging the thermal code from Zhang, but his merge (commit 5a924a07f882: "Merge branches 'thermal-core' and 'thermal-intel' of .git into next") of the thermal-core and thermal-intel branches was wrong. In thermal-core, commit 17e8351a77 ("thermal: consistently use int for temperatures") converted the thermal layer to use "int" for temperatures. But in parallel, in the thermal-intel branch commit d0a12625d2 ("thermal: Add Intel PCH thermal driver") added support for the intel PCH thermal sensor using the old interfaces that used "unsigned long" pointers. This resulted in warnings like this: drivers/thermal/intel_pch_thermal.c:184:14: warning: initialization from incompatible pointer type [-Wincompatible-pointer-types] .get_temp = pch_thermal_get_temp, ^ drivers/thermal/intel_pch_thermal.c:184:14: note: (near initialization for ‘tzd_ops.get_temp’) drivers/thermal/intel_pch_thermal.c:186:19: warning: initialization from incompatible pointer type [-Wincompatible-pointer-types] .get_trip_temp = pch_get_trip_temp, ^ drivers/thermal/intel_pch_thermal.c:186:19: note: (near initialization for ‘tzd_ops.get_trip_temp’) This fixes it. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>		2015-09-11 20:06:59 -07:00
..
int340x_thermal
samsung	Merge branches 'thermal-core' and 'thermal-intel' of .git into next	2015-09-02 10:08:02 +08:00
st	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux	2015-09-11 16:13:47 -07:00
ti-soc-thermal
armada_thermal.c
clock_cooling.c
cpu_cooling.c	thermal/cpu_cooling: update policy limits if clipped_freq < policy->max	2015-08-14 18:26:23 -07:00
db8500_cpufreq_cooling.c
db8500_thermal.c
dove_thermal.c
fair_share.c
gov_bang_bang.c
hisi_thermal.c	Merge branches 'thermal-core' and 'thermal-intel' of .git into next	2015-09-02 10:08:02 +08:00
imx_thermal.c
intel_pch_thermal.c	thermal: fix intel PCH thermal driver mismerge	2015-09-11 20:06:59 -07:00
intel_powerclamp.c	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux	2015-09-11 16:13:47 -07:00
intel_quark_dts_thermal.c
intel_soc_dts_iosf.c
intel_soc_dts_iosf.h
intel_soc_dts_thermal.c
Kconfig	thermal: Add Intel PCH thermal driver	2015-08-04 10:06:08 +08:00
kirkwood_thermal.c
Makefile	thermal: Add Intel PCH thermal driver	2015-08-04 10:06:08 +08:00
of-thermal.c
power_allocator.c	Merge branches 'thermal-core' and 'thermal-intel' of .git into next	2015-09-02 10:08:02 +08:00
qcom-spmi-temp-alarm.c
rcar_thermal.c
rockchip_thermal.c
spear_thermal.c
step_wise.c
tegra_soctherm.c
thermal_core.c	Merge branches 'thermal-core' and 'thermal-intel' of .git into next	2015-09-02 10:08:02 +08:00
thermal_core.h
thermal_hwmon.c
thermal_hwmon.h
user_space.c
x86_pkg_temp_thermal.c