refresh kernel patches
[openwrt/openwrt.git] / target / linux / ar7 / patches-2.6.25 / 110-flash.patch
1 Index: linux-2.6.25.4/drivers/mtd/Kconfig
2 ===================================================================
3 --- linux-2.6.25.4.orig/drivers/mtd/Kconfig
4 +++ linux-2.6.25.4/drivers/mtd/Kconfig
5 @@ -168,6 +168,12 @@ config MTD_OF_PARTS
6 the partition map from the children of the flash node,
7 as described in Documentation/powerpc/booting-without-of.txt.
8
9 +config MTD_AR7_PARTS
10 + tristate "TI AR7 partitioning support"
11 + depends on MTD_PARTITIONS
12 + ---help---
13 + TI AR7 partitioning support
14 +
15 comment "User Modules And Translation Layers"
16
17 config MTD_CHAR
18 Index: linux-2.6.25.4/drivers/mtd/Makefile
19 ===================================================================
20 --- linux-2.6.25.4.orig/drivers/mtd/Makefile
21 +++ linux-2.6.25.4/drivers/mtd/Makefile
22 @@ -12,6 +12,7 @@ obj-$(CONFIG_MTD_REDBOOT_PARTS) += redbo
23 obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o
24 obj-$(CONFIG_MTD_AFS_PARTS) += afs.o
25 obj-$(CONFIG_MTD_OF_PARTS) += ofpart.o
26 +obj-$(CONFIG_MTD_AR7_PARTS) += ar7part.o
27
28 # 'Users' - code which presents functionality to userspace.
29 obj-$(CONFIG_MTD_CHAR) += mtdchar.o
30 Index: linux-2.6.25.4/drivers/mtd/maps/physmap.c
31 ===================================================================
32 --- linux-2.6.25.4.orig/drivers/mtd/maps/physmap.c
33 +++ linux-2.6.25.4/drivers/mtd/maps/physmap.c
34 @@ -87,7 +87,8 @@ static int physmap_flash_remove(struct p
35
36 static const char *rom_probe_types[] = { "cfi_probe", "jedec_probe", "map_rom", NULL };
37 #ifdef CONFIG_MTD_PARTITIONS
38 -static const char *part_probe_types[] = { "cmdlinepart", "RedBoot", NULL };
39 +static const char *part_probe_types[] = {"cmdlinepart", "RedBoot",
40 + "ar7part", NULL };
41 #endif
42
43 static int physmap_flash_probe(struct platform_device *dev)