ar71xx: merge machine patches
[openwrt.git] / target / linux / ar71xx / patches-3.6 / 413-mtd-ar934x-nand-driver.patch
1 --- a/drivers/mtd/nand/Kconfig
2 +++ b/drivers/mtd/nand/Kconfig
3 @@ -615,4 +615,8 @@ config MTD_NAND_RB750
4         tristate "NAND flash driver for the RouterBoard 750"
5         depends on MTD_NAND && ATH79_MACH_RB750
6  
7 +config MTD_NAND_AR934X
8 +       tristate "NAND flash driver for the Atheros AR934x SoCs"
9 +       depends on SOC_AR934X
10 +
11  endif # MTD_NAND
12 --- a/drivers/mtd/nand/Makefile
13 +++ b/drivers/mtd/nand/Makefile
14 @@ -11,6 +11,7 @@ obj-$(CONFIG_MTD_SM_COMMON)           += sm_comm
15  obj-$(CONFIG_MTD_NAND_CAFE)            += cafe_nand.o
16  obj-$(CONFIG_MTD_NAND_SPIA)            += spia.o
17  obj-$(CONFIG_MTD_NAND_AMS_DELTA)       += ams-delta.o
18 +obj-$(CONFIG_MTD_NAND_AR934X)          += ar934x_nfc.o
19  obj-$(CONFIG_MTD_NAND_AUTCPU12)                += autcpu12.o
20  obj-$(CONFIG_MTD_NAND_DENALI)          += denali.o
21  obj-$(CONFIG_MTD_NAND_AU1550)          += au1550nd.o