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
..
accessibility	…
acpi	…
amba	…
android	…
ata	…
atm	…
auxdisplay	…
base	…
bcma	…
block	…
bluetooth	…
bus	…
cdrom	…
char	…
clk	…
clocksource	…
connector	…
cpufreq	…
cpuidle	…
crypto	…
dca	…
devfreq	…
dio	…
dma	…
dma-buf	…
edac	…
eisa	…
extcon	…
firewire	…
firmware	…
fmc	…
gpio	…
gpu	…
hid	…
hsi	…
hv	…
hwmon	…
hwspinlock	…
hwtracing/coresight	…
i2c	…
ide	…
idle	…
iio	…
infiniband	…
input	…
iommu	…
ipack	…
irqchip	…
isdn	…
leds	…
lguest	…
macintosh	…
mailbox	…
mcb	…
md	…
media	…
memory	…
memstick	…
message	…
mfd	…
misc	…
mmc	…
mtd	…
net	…
nfc	…
ntb	…
nubus	…
nvdimm	…
nvmem	…
of	…
oprofile	…
parisc	…
parport	…
pci	…
pcmcia	…
perf	…
phy	…
pinctrl	…
platform	…
pnp	…
power	…
powercap	…
pps	…
ps3	…
ptp	…
pwm	…
rapidio	…
ras	…
regulator	…
remoteproc	…
reset	…
rpmsg	…
rtc	…
s390	…
sbus	…
scsi	…
sfi	…
sh	…
sn	…
soc	…
spi	…
spmi	…
ssb	…
staging	…
target	…
tc	…
thermal	thermal: fix intel PCH thermal driver mismerge	2015-09-11 20:06:59 -07:00
thunderbolt	…
tty	…
uio	…
usb	…
uwb	…
vfio	…
vhost	…
video	…
virt	…
virtio	…
vlynq	…
vme	…
w1	…
watchdog	…
xen	…
zorro	…
Kconfig	…
Makefile	…