diff --git a/[refs] b/[refs]
index 53ba788bffc2..e7b51db799d5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c0e6616ae69774f42fda7a8cc5dc699aff311b40
+refs/heads/master: 4b08e149c0e02e97ec49c2a31d14a0d3a02f8074
diff --git a/trunk/drivers/mtd/ofpart.c b/trunk/drivers/mtd/ofpart.c
index 9e45b3f39c0e..3e164f0c9295 100644
--- a/trunk/drivers/mtd/ofpart.c
+++ b/trunk/drivers/mtd/ofpart.c
@@ -46,6 +46,13 @@ int __devinit of_mtd_parse_partitions(struct device *dev,
 		const u32 *reg;
 		int len;
 
+		/* check if this is a partition node */
+		partname = of_get_property(pp, "name", &len);
+		if (strcmp(partname, "partition") != 0) {
+			nr_parts--;
+			continue;
+		}
+
 		reg = of_get_property(pp, "reg", &len);
 		if (!reg || (len != 2 * sizeof(u32))) {
 			of_node_put(pp);