From 57fa260dfa1f33cb34d5645493f1e1a8e83df4c0 Mon Sep 17 00:00:00 2001 From: Ben Dooks Date: Mon, 28 May 2007 20:11:37 +0100 Subject: [PATCH] --- yaml --- r: 68457 b: refs/heads/master c: 029a9eb1f667ca71fe7eb3bf8962f01ac4d252a5 h: refs/heads/master i: 68455: 16edf501621b60d533fc86cd1bb38acaf8585b85 v: v3 --- [refs] | 2 +- trunk/drivers/mtd/chips/cfi_cmdset_0001.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index da2e93776495..d8f5ba158611 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ce0f33adec9737bdfe59a10d03fed0c674136ffe +refs/heads/master: 029a9eb1f667ca71fe7eb3bf8962f01ac4d252a5 diff --git a/trunk/drivers/mtd/chips/cfi_cmdset_0001.c b/trunk/drivers/mtd/chips/cfi_cmdset_0001.c index 2f19fa78d24a..46d782f261e7 100644 --- a/trunk/drivers/mtd/chips/cfi_cmdset_0001.c +++ b/trunk/drivers/mtd/chips/cfi_cmdset_0001.c @@ -1780,7 +1780,7 @@ static int __xipram do_erase_oneblock(struct map_info *map, struct flchip *chip, return ret; } -int cfi_intelext_erase_varsize(struct mtd_info *mtd, struct erase_info *instr) +static int cfi_intelext_erase_varsize(struct mtd_info *mtd, struct erase_info *instr) { unsigned long ofs, len; int ret; @@ -2255,7 +2255,7 @@ static void cfi_intelext_save_locks(struct mtd_info *mtd) adr = region->offset + block * len; status = cfi_varsize_frob(mtd, - do_getlockstatus_oneblock, adr, len, 0); + do_getlockstatus_oneblock, adr, len, NULL); if (status) set_bit(block, region->lockmap); else