Merge branch 'x86/urgent' into core/efi, to pick up a pending EFI fix

[deliverable/linux.git] / drivers / thermal / kirkwood_thermal.c

diff --git a/drivers/thermal/kirkwood_thermal.c b/drivers/thermal/kirkwood_thermal.c
index 11041fe63dc2b2ee17505561eebffea50c6331f9..892236621767d851e53b9710d47541bc3445e825 100644 (file)
--- a/drivers/thermal/kirkwood_thermal.c
+++ b/drivers/thermal/kirkwood_thermal.c
@@ -33,7 +33,7 @@ struct kirkwood_thermal_priv {
 };
 
 static int kirkwood_get_temp(struct thermal_zone_device *thermal,
-                         unsigned long *temp)
+                         int *temp)
 {
        unsigned long reg;
        struct kirkwood_thermal_priv *priv = thermal->devdata;