From 6f87015c36586fbe732aab390d4623c83670c8ca Mon Sep 17 00:00:00 2001
From: Russell King <rmk@arm.linux.org.uk>
Date: Sun, 27 Sep 2009 23:51:04 +0100
Subject: [PATCH] --- yaml --- r: 176911 b: refs/heads/master c:
 794d579ae17a7ec8028e4844096059c19431a96c h: refs/heads/master i:   176909:
 4f02d4cd211644d6aa8a25f39b2651451f20f203   176907:
 e133bc8e1086f6a05d1c59f19abe800758b1c49d   176903:
 0d0d878b69108c3a457669cc98c64daadc2da47b   176895:
 55d9bbb21ccc7db342fc0d471cbc209207b5b3d8 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/mtd/maps/sa1100-flash.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 2e8557b5ee90..89614e20cfd9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c1558b55c55620f54f0f78cb8295947a2a3f6de2
+refs/heads/master: 794d579ae17a7ec8028e4844096059c19431a96c
diff --git a/trunk/drivers/mtd/maps/sa1100-flash.c b/trunk/drivers/mtd/maps/sa1100-flash.c
index fdb97f3d30e9..d7a47574d21e 100644
--- a/trunk/drivers/mtd/maps/sa1100-flash.c
+++ b/trunk/drivers/mtd/maps/sa1100-flash.c
@@ -209,8 +209,8 @@ static int sa1100_probe_subdev(struct sa_subdev_info *subdev, struct resource *r
 	}
 	subdev->mtd->owner = THIS_MODULE;
 
-	printk(KERN_INFO "SA1100 flash: CFI device at 0x%08lx, %dMiB, "
-		"%d-bit\n", phys, subdev->mtd->size >> 20,
+	printk(KERN_INFO "SA1100 flash: CFI device at 0x%08lx, %uMiB, %d-bit\n",
+		phys, (unsigned)(subdev->mtd->size >> 20),
 		subdev->map.bankwidth * 8);
 
 	return 0;