Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / drivers / mtd / mtdblock.c

diff --git a/drivers/mtd/mtdblock.c b/drivers/mtd/mtdblock.c
index a5b1933c0490946d3c328f13074865af10718f19..b2d5ed1cbc94a670bff86f3e9a78d131002d8014 100644 (file)
--- a/drivers/mtd/mtdblock.c
+++ b/drivers/mtd/mtdblock.c
@@ -56,7 +56,7 @@ struct mtdblk_dev {
  */
 
 static int erase_write (struct mtd_info *mtd, unsigned long pos,
-                       int len, const char *buf)
+                       unsigned int len, const char *buf)
 {
        struct erase_info erase;
        size_t retlen;