summaryrefslogtreecommitdiff
path: root/target/linux/ar71xx/patches-2.6.29/102-mtd_m25p80_add_myloader_parser.patch
blob: ecafebad86b3a06ee0de0979514918dcfe288333 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -712,12 +712,17 @@ static int __devinit m25p_probe(struct s
 		struct mtd_partition	*parts = NULL;
 		int			nr_parts = 0;
 
+		static const char *part_probes[] = {
 #ifdef CONFIG_MTD_CMDLINE_PARTS
-		static const char *part_probes[] = { "cmdlinepart", NULL, };
+						"cmdlinepart",
+#endif
+#ifdef CONFIG_MTD_MYLOADER_PARTS
+						"MyLoader",
+#endif
+					       	NULL, };
 
 		nr_parts = parse_mtd_partitions(&flash->mtd,
 				part_probes, &parts, 0);
-#endif
 
 		if (nr_parts <= 0 && data && data->parts) {
 			parts = data->parts;