diff --git a/[refs] b/[refs]
index 578be6cfa317..7eea2ec8576f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2257594f9c2043f347c6d3961f804008da7982d1
+refs/heads/master: 6127cfcd3d134ec63d0d154bb24823bd33774c10
diff --git a/trunk/drivers/mtd/maps/pmcmsp-flash.c b/trunk/drivers/mtd/maps/pmcmsp-flash.c
index f43ba2815cbb..4768bd5459d6 100644
--- a/trunk/drivers/mtd/maps/pmcmsp-flash.c
+++ b/trunk/drivers/mtd/maps/pmcmsp-flash.c
@@ -48,7 +48,7 @@ static int fcnt;
 
 #define DEBUG_MARKER printk(KERN_NOTICE "%s[%d]\n", __func__, __LINE__)
 
-int __init init_msp_flash(void)
+static int __init init_msp_flash(void)
 {
 	int i, j;
 	int offset, coff;