summaryrefslogtreecommitdiff
path: root/drivers/misc
diff options
context:
space:
mode:
authorBernhard Walle <bernhard@bwalle.de>2012-02-25 10:28:12 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-03-02 16:27:54 -0800
commitb222258ac11cae3e0350fe5992ad164a7b128103 (patch)
tree3fc51d7bc95e9e22170d22b9fe8bb480f828aa2d /drivers/misc
parent5aa4d20dc3dae3b6003eadd83b3d71318e7528d5 (diff)
misc: bmp085: Use unsigned long to store jiffies
This fixes following compilation warning: drivers/misc/bmp085.c: In function ‘bmp085_get_pressure’: drivers/misc/bmp085.c:238:4: warning: comparison of distinct pointer types lacks a cast [enabled by default] Signed-off-by: Bernhard Walle <bernhard@bwalle.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc')
-rw-r--r--drivers/misc/bmp085.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/bmp085.c b/drivers/misc/bmp085.c
index b088abc0f45b..76c3064629f1 100644
--- a/drivers/misc/bmp085.c
+++ b/drivers/misc/bmp085.c
@@ -87,7 +87,7 @@ struct bmp085_data {
u32 raw_temperature;
u32 raw_pressure;
unsigned char oversampling_setting;
- u32 last_temp_measurement;
+ unsigned long last_temp_measurement;
s32 b6; /* calculated temperature correction coefficient */
};