[kernel] update to 2.6.25.12
[openwrt-10.03/.git] / target / linux / generic-2.6 / patches-2.6.25 / 910-m25p80_redboot_partitions.patch
1 --- a/drivers/mtd/devices/m25p80.c
2 +++ b/drivers/mtd/devices/m25p80.c
3 @@ -627,12 +627,10 @@
4                 struct mtd_partition    *parts = NULL;
5                 int                     nr_parts = 0;
6  
7 -#ifdef CONFIG_MTD_CMDLINE_PARTS
8 -               static const char *part_probes[] = { "cmdlinepart", NULL, };
9 +               static const char *part_probes[] = { "RedBoot", "cmdlinepart", NULL, };
10  
11                 nr_parts = parse_mtd_partitions(&flash->mtd,
12                                 part_probes, &parts, 0);
13 -#endif
14  
15                 if (nr_parts <= 0 && data && data->parts) {
16                         parts = data->parts;