diff --git a/[refs] b/[refs]
index 573937e96be5..86acdb7461f9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5aa4d20dc3dae3b6003eadd83b3d71318e7528d5
+refs/heads/master: b222258ac11cae3e0350fe5992ad164a7b128103
diff --git a/trunk/drivers/misc/bmp085.c b/trunk/drivers/misc/bmp085.c
index b088abc0f45b..76c3064629f1 100644
--- a/trunk/drivers/misc/bmp085.c
+++ b/trunk/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 */
 };