diff --git a/[refs] b/[refs]
index 0b9240b30711..58aaa9451c1e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4ed0156f774cf50252e7f51032d1cc857fe86879
+refs/heads/master: f24ff6bf8c903bc0c645bf87fbe87f9a6d9f634f
diff --git a/trunk/drivers/mtd/maps/physmap.c b/trunk/drivers/mtd/maps/physmap.c
index bc82f702aa3c..433c3cac3ca9 100644
--- a/trunk/drivers/mtd/maps/physmap.c
+++ b/trunk/drivers/mtd/maps/physmap.c
@@ -89,9 +89,9 @@ static int physmap_flash_probe(struct platform_device *dev)
 	if (physmap_data == NULL)
 		return -ENODEV;
 
-       	printk(KERN_NOTICE "physmap platform flash device: %.8lx at %.8lx\n",
-		dev->resource->end - dev->resource->start + 1,
-		dev->resource->start);
+       	printk(KERN_NOTICE "physmap platform flash device: %.8llx at %.8llx\n",
+	    (unsigned long long)dev->resource->end - dev->resource->start + 1,
+	    (unsigned long long)dev->resource->start);
 
 	info = kmalloc(sizeof(struct physmap_flash_info), GFP_KERNEL);
 	if (info == NULL) {