Merge branch 'vhost-net' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

[~andy/linux] / drivers / misc / bmp085.c

diff --git a/drivers/misc/bmp085.c b/drivers/misc/bmp085.c
index b088abc0f45b57b2fc3092144ec82575acf7bae9..76c3064629f1c802ef38c0f3ad4ae15f5a1142cb 100644 (file)
--- 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 */
 };