kernel: update 3.10 to 3.10.28
[openwrt.git] / target / linux / ar7 / patches-3.10 / 320-ac49x-mtd-partitions.patch
1 --- a/drivers/mtd/Kconfig
2 +++ b/drivers/mtd/Kconfig
3 @@ -192,6 +192,11 @@ config MTD_OF_PARTS
4           the partition map from the children of the flash node,
5           as described in Documentation/devicetree/booting-without-of.txt.
6  
7 +config MTD_AC49X_PARTS
8 +       tristate "AudioCodes AC49X partitioning support"
9 +       ---help---
10 +         AudioCodes AC49X partitioning support
11 +
12  config MTD_AR7_PARTS
13         tristate "TI AR7 partitioning support"
14         ---help---
15 --- a/drivers/mtd/Makefile
16 +++ b/drivers/mtd/Makefile
17 @@ -15,6 +15,7 @@ mtd-$(CONFIG_MTD_SPLIT_LZMA_FW) += mtdsp
18  obj-$(CONFIG_MTD_OF_PARTS)     += ofpart.o
19  obj-$(CONFIG_MTD_REDBOOT_PARTS) += redboot.o
20  obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o
21 +obj-$(CONFIG_MTD_AC49X_PARTS)  += ac49xpart.o
22  obj-$(CONFIG_MTD_AFS_PARTS)    += afs.o
23  obj-$(CONFIG_MTD_AR7_PARTS)    += ar7part.o titanpart.o
24  obj-$(CONFIG_MTD_BCM63XX_PARTS)        += bcm63xxpart.o
25 --- a/arch/mips/ar7/platform.c
26 +++ b/arch/mips/ar7/platform.c
27 @@ -202,7 +202,7 @@ static struct resource physmap_flash_res
28         .end    = 0x11ffffff,
29  };
30  
31 -static const char *ar7_probe_types[] = { "ar7part", NULL };
32 +static const char *ar7_probe_types[] = { "ac49xpart", "ar7part", NULL };
33  
34  static struct physmap_flash_data physmap_flash_data = {
35         .width  = 2,