kernel: 2.6.32: integrate m25p80 driver related patches from ar71xx
[openwrt/svn-archive/archive.git] / target / linux / ar71xx / patches-2.6.32 / 104-mtd_m25p80_add_redboot_parser.patch
1 --- a/drivers/mtd/devices/m25p80.c
2 +++ b/drivers/mtd/devices/m25p80.c
3 @@ -877,6 +877,15 @@ static int __devinit m25p_probe(struct s
4 }
5 #endif
6
7 +#ifdef CONFIG_MTD_REDBOOT_PARTS
8 + if (nr_parts <= 0) {
9 + static const char *part_probes[]
10 + = { "RedBoot", NULL, };
11 +
12 + nr_parts = parse_mtd_partitions(&flash->mtd,
13 + part_probes, &parts, 0);
14 + }
15 +#endif
16 if (nr_parts <= 0 && data && data->parts) {
17 parts = data->parts;
18 nr_parts = data->nr_parts;