diff --git a/[refs] b/[refs]
index 453174aae434..ea7c2136d390 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5ce45d50056e20aca50f19229d8a7e003569ad26
+refs/heads/master: eb8e31831a603f285ee9e6ffc59d5366e0ff8a8e
diff --git a/trunk/drivers/mtd/chips/cfi_cmdset_0020.c b/trunk/drivers/mtd/chips/cfi_cmdset_0020.c
index 669caebba451..1b720cc571f3 100644
--- a/trunk/drivers/mtd/chips/cfi_cmdset_0020.c
+++ b/trunk/drivers/mtd/chips/cfi_cmdset_0020.c
@@ -893,7 +893,8 @@ static inline int do_erase_oneblock(struct map_info *map, struct flchip *chip, u
 	return ret;
 }
 
-int cfi_staa_erase_varsize(struct mtd_info *mtd, struct erase_info *instr)
+static int cfi_staa_erase_varsize(struct mtd_info *mtd,
+				  struct erase_info *instr)
 {	struct map_info *map = mtd->priv;
 	struct cfi_private *cfi = map->fldrv_priv;
 	unsigned long adr, len;