ar71xx: 3.2: fix build errors if PCI is not enabled
[15.05/openwrt.git] / target / linux / ar71xx / patches-2.6.39 / 100-mtd-m25p80-allow-to-pass-probe-types-via-platform-data.patch
1 --- a/drivers/mtd/devices/m25p80.c
2 +++ b/drivers/mtd/devices/m25p80.c
3 @@ -974,6 +974,10 @@ static int __devinit m25p_probe(struct s
4                                         part_probes, &parts, 0);
5                 }
6  
7 +               if (nr_parts <= 0 && data && data->part_probes)
8 +                       nr_parts = parse_mtd_partitions(&flash->mtd,
9 +                                       data->part_probes, &parts, 0);
10 +
11                 if (nr_parts <= 0 && data && data->parts) {
12                         parts = data->parts;
13                         nr_parts = data->nr_parts;
14 --- a/include/linux/spi/flash.h
15 +++ b/include/linux/spi/flash.h
16 @@ -24,6 +24,7 @@ struct flash_platform_data {
17         unsigned int    nr_parts;
18  
19         char            *type;
20 +       const char      **part_probes;
21  
22         /* we'll likely add more ... use JEDEC IDs, etc */
23  };