From b1c74a936a6aed22db3490a8d8c5ec303a695423 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Mon, 29 May 2006 11:33:33 +0100
Subject: [PATCH] --- yaml --- r: 27900 b: refs/heads/master c:
 19676ff0a64af9d75d48f17cb67bee8110f6ffbf h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/mtd/devices/m25p80.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f3e5ec004c43..af8d38ecd254 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 33280eac704e3e156eef2fa9ed9ddf427a1c223c
+refs/heads/master: 19676ff0a64af9d75d48f17cb67bee8110f6ffbf
diff --git a/trunk/drivers/mtd/devices/m25p80.c b/trunk/drivers/mtd/devices/m25p80.c
index d5f24089be71..04e65d5dae00 100644
--- a/trunk/drivers/mtd/devices/m25p80.c
+++ b/trunk/drivers/mtd/devices/m25p80.c
@@ -186,7 +186,7 @@ static int m25p80_erase(struct mtd_info *mtd, struct erase_info *instr)
 	struct m25p *flash = mtd_to_m25p(mtd);
 	u32 addr,len;
 
-	DEBUG(MTD_DEBUG_LEVEL2, "%s: %s %s 0x%08x, len %zd\n",
+	DEBUG(MTD_DEBUG_LEVEL2, "%s: %s %s 0x%08x, len %d\n",
 			flash->spi->dev.bus_id, __FUNCTION__, "at",
 			(u32)instr->addr, instr->len);