[kernel] refresh 2.6.25 patches
[openwrt/svn-archive/archive.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 @@ config MTD_AR7_PARTS
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/maps/physmap.c
17 +++ b/drivers/mtd/maps/physmap.c
18 @@ -87,7 +87,7 @@
19
20 static const char *rom_probe_types[] = { "cfi_probe", "jedec_probe", "map_rom", NULL };
21 #ifdef CONFIG_MTD_PARTITIONS
22 -static const char *part_probe_types[] = { "cmdlinepart", "RedBoot", NULL };
23 +static const char *part_probe_types[] = { "cmdlinepart", "RedBoot", "ar7part", NULL };
24 #endif
25
26 static int physmap_flash_probe(struct platform_device *dev)