diff --git a/[refs] b/[refs]
index 88c3c849e313..0068139c90b1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fd0e5187458041c82fea616575104698397d68d3
+refs/heads/master: f6a673b3f4f93c1c50e1b18f29254b0531b722a8
diff --git a/trunk/drivers/mtd/chips/gen_probe.c b/trunk/drivers/mtd/chips/gen_probe.c
index b2d30525c04c..52d59d35091d 100644
--- a/trunk/drivers/mtd/chips/gen_probe.c
+++ b/trunk/drivers/mtd/chips/gen_probe.c
@@ -39,7 +39,7 @@ struct mtd_info *mtd_do_chip_probe(struct map_info *map, struct chip_probe *cp)
 
 	if (mtd) {
 		if (mtd->size > map->size) {
-			printk(KERN_WARNING "Reducing visibility of %lKiB chip to %lKiB\n",
+			printk(KERN_WARNING "Reducing visibility of %ldKiB chip to %ldKiB\n",
 			       (unsigned long)mtd->size >> 10, 
 			       (unsigned long)map->size >> 10);
 			mtd->size = map->size;