diff --git a/[refs] b/[refs]
index 9db9190ba5aa..e66362c51251 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d849257c428bf9f06f25fa3dea14cd1e7650948d
+refs/heads/master: 2e257a2d6d5400e9ec135da406737c0cb2a02a2a
diff --git a/trunk/drivers/mtd/maps/cfi_flagadm.c b/trunk/drivers/mtd/maps/cfi_flagadm.c
index 0ecc3f6d735b..b4ed81611918 100644
--- a/trunk/drivers/mtd/maps/cfi_flagadm.c
+++ b/trunk/drivers/mtd/maps/cfi_flagadm.c
@@ -88,7 +88,7 @@ struct mtd_partition flagadm_parts[] = {
 
 static struct mtd_info *mymtd;
 
-int __init init_flagadm(void)
+static int __init init_flagadm(void)
 {
 	printk(KERN_NOTICE "FlagaDM flash device: %x at %x\n",
 			FLASH_SIZE, FLASH_PHYS_ADDR);