--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
-@@ -968,6 +968,16 @@ static int __devinit m25p_probe(struct s
- part_probes, &parts, 0);
- }
+@@ -972,6 +972,16 @@ static int __devinit m25p_probe(struct s
+ nr_parts = parse_mtd_partitions(&flash->mtd,
+ data->part_probes, &parts, 0);
+#ifdef CONFIG_MTD_MYLOADER_PARTS
+ if (nr_parts <= 0) {