diff --git a/[refs] b/[refs]
index ff4dc3088ae6..399910e6b6c7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3a8fb12ae9fdbb712f11f9c73e5d08dc34f82118
+refs/heads/master: d117040be074fd1c019b751515f79efe99cd7d76
diff --git a/trunk/drivers/mtd/maps/edb7312.c b/trunk/drivers/mtd/maps/edb7312.c
index fe42a212bb3e..b07acd69277a 100644
--- a/trunk/drivers/mtd/maps/edb7312.c
+++ b/trunk/drivers/mtd/maps/edb7312.c
@@ -88,8 +88,9 @@ static int __init init_edb7312nor(void)
 	}
 	if (mymtd) {
 		mymtd->owner = THIS_MODULE;
+		mymtd->name = MTDID;
 
-		mtd_parts_nb = parse_mtd_partitions(mymtd, probes, &mtd_parts, MTDID);
+		mtd_parts_nb = parse_mtd_partitions(mymtd, probes, &mtd_parts, 0);
 		if (mtd_parts_nb > 0)
 			part_type = "detected";