[kernel] update to 2.6.26.5 and 2.6.25.17
[openwrt-10.03/.git] / target / linux / ar7 / patches-2.6.26 / 110-flash.patch
1 --- a/drivers/mtd/Kconfig
2 +++ b/drivers/mtd/Kconfig
3 @@ -174,6 +174,12 @@
4         ---help---
5           TI AR7 partitioning support
6  
7 +config MTD_AR7_PARTS
8 +       tristate "TI AR7 partitioning support"
9 +       depends on MTD_PARTITIONS
10 +       ---help---
11 +         TI AR7 partitioning support
12 +
13  comment "User Modules And Translation Layers"
14  
15  config MTD_CHAR
16 --- a/drivers/mtd/Makefile
17 +++ b/drivers/mtd/Makefile
18 @@ -13,6 +13,7 @@
19  obj-$(CONFIG_MTD_AFS_PARTS)    += afs.o
20  obj-$(CONFIG_MTD_AR7_PARTS)    += ar7part.o
21  obj-$(CONFIG_MTD_OF_PARTS)      += ofpart.o
22 +obj-$(CONFIG_MTD_AR7_PARTS)    += ar7part.o
23  
24  # 'Users' - code which presents functionality to userspace.
25  obj-$(CONFIG_MTD_CHAR)         += mtdchar.o
26 --- a/drivers/mtd/maps/physmap.c
27 +++ b/drivers/mtd/maps/physmap.c
28 @@ -87,7 +87,8 @@
29  
30  static const char *rom_probe_types[] = { "cfi_probe", "jedec_probe", "map_rom", NULL };
31  #ifdef CONFIG_MTD_PARTITIONS
32 -static const char *part_probe_types[] = { "cmdlinepart", "RedBoot", NULL };
33 +static const char *part_probe_types[] = {"cmdlinepart", "RedBoot",
34 +                                       "ar7part", NULL };
35  #endif
36  
37  static int physmap_flash_probe(struct platform_device *dev)