diff --git a/[refs] b/[refs]
index f8823b688d6d..5d0164f7d20a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: efc63c4fb0f95865907472d1c6bc0cfea9ee156b
+refs/heads/master: 2e3e31c05798786c131bf257f64848d4a9a894ab
diff --git a/trunk/drivers/rtc/rtc-ds1742.c b/trunk/drivers/rtc/rtc-ds1742.c
index b2e5481ba3b6..67291b0f8283 100644
--- a/trunk/drivers/rtc/rtc-ds1742.c
+++ b/trunk/drivers/rtc/rtc-ds1742.c
@@ -55,7 +55,7 @@ struct rtc_plat_data {
 	void __iomem *ioaddr_rtc;
 	size_t size_nvram;
 	size_t size;
-	unsigned long baseaddr;
+	resource_size_t baseaddr;
 	unsigned long last_jiffies;
 };