ar71xx: merge WZR-HP-G301NH support into WZR-HP-G300NH
[openwrt.git] / target / linux / ar71xx / patches-2.6.39 / 109-mtd-wrt160nl-trx-parser.patch
1 --- a/drivers/mtd/devices/m25p80.c
2 +++ b/drivers/mtd/devices/m25p80.c
3 @@ -987,6 +987,16 @@ static int __devinit m25p_probe(struct s
4 part_probes, &parts, 0);
5 }
6 #endif
7 +
8 +#ifdef CONFIG_MTD_WRT160NL_PARTS
9 + if (nr_parts <= 0) {
10 + static const char *part_probes[]
11 + = { "wrt160nl", NULL, };
12 +
13 + nr_parts = parse_mtd_partitions(&flash->mtd,
14 + part_probes, &parts, 0);
15 + }
16 +#endif
17 if (nr_parts <= 0 && data && data->parts) {
18 parts = data->parts;
19 nr_parts = data->nr_parts;
20 --- a/drivers/mtd/Kconfig
21 +++ b/drivers/mtd/Kconfig
22 @@ -176,6 +176,12 @@ config MTD_AR7_PARTS
23
24 endif # MTD_PARTITIONS
25
26 +config MTD_WRT160NL_PARTS
27 + tristate "Linksys WRT160NL partitioning support"
28 + depends on MTD_PARTITIONS && AR71XX_MACH_WRT160NL
29 + ---help---
30 + Linksys WRT160NL partitioning support
31 +
32 config MTD_MYLOADER_PARTS
33 tristate "MyLoader partition parsing"
34 depends on MTD_PARTITIONS && (ADM5120 || ATHEROS_AR231X || ATHEROS_AR71XX)
35 --- a/drivers/mtd/Makefile
36 +++ b/drivers/mtd/Makefile
37 @@ -12,6 +12,7 @@ obj-$(CONFIG_MTD_REDBOOT_PARTS) += redbo
38 obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o
39 obj-$(CONFIG_MTD_AFS_PARTS) += afs.o
40 obj-$(CONFIG_MTD_AR7_PARTS) += ar7part.o
41 +obj-$(CONFIG_MTD_WRT160NL_PARTS) += wrt160nl_part.o
42 obj-$(CONFIG_MTD_MYLOADER_PARTS) += myloader.o
43
44 # 'Users' - code which presents functionality to userspace.
This page took 0.05018 seconds and 5 git commands to generate.