23 lines
610 B
Diff
23 lines
610 B
Diff
|
--- a/drivers/mtd/devices/m25p80.c
|
||
|
|
+++ b/drivers/mtd/devices/m25p80.c
|
||
|
|
@@ -645,12 +645,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;
|