diff --git a/[refs] b/[refs]
index 355bfdaf2042..959ac6db31e4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ad7d314480d357db0466bef843cdc1abd9441d4f
+refs/heads/master: 0d36da3b409536a24266c5f0972f2e1cfae1afd4
diff --git a/trunk/include/linux/mtd/map.h b/trunk/include/linux/mtd/map.h
index 28d461d862bd..81f3a314dd76 100644
--- a/trunk/include/linux/mtd/map.h
+++ b/trunk/include/linux/mtd/map.h
@@ -183,7 +183,7 @@ typedef union {
 struct map_info {
 	char *name;
 	unsigned long size;
-	unsigned long phys;
+	resource_size_t phys;
 #define NO_XIP (-1UL)
 
 	void __iomem *virt;