aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar71xx/config-3.14
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-11-23 16:27:19 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-11-23 16:27:19 +0000
commit174d16e59f654e24bf8554c6506512fc1ad1d7db (patch)
treebf2e5705fc6c7e808334321bce66e5a4ac33a0b2 /target/linux/ar71xx/config-3.14
parent185172bdd37facc5337c0fc8fd7b2c86bad9cecf (diff)
downloadupstream-174d16e59f654e24bf8554c6506512fc1ad1d7db.tar.gz
upstream-174d16e59f654e24bf8554c6506512fc1ad1d7db.tar.bz2
upstream-174d16e59f654e24bf8554c6506512fc1ad1d7db.zip
ar71xx: merge changes from 3.10 that were forgotten for 3.14
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 43347
Diffstat (limited to 'target/linux/ar71xx/config-3.14')
-rw-r--r--target/linux/ar71xx/config-3.143
1 files changed, 2 insertions, 1 deletions
diff --git a/target/linux/ar71xx/config-3.14 b/target/linux/ar71xx/config-3.14
index acfb3a8443..2f1ccce64b 100644
--- a/target/linux/ar71xx/config-3.14
+++ b/target/linux/ar71xx/config-3.14
@@ -41,6 +41,7 @@ CONFIG_ATH79_MACH_BHU_BXU2000N2_A=y
CONFIG_ATH79_MACH_CAP4200AG=y
CONFIG_ATH79_MACH_CARAMBOLA2=y
CONFIG_ATH79_MACH_DB120=y
+CONFIG_ATH79_MACH_DHP_1565_A1=y
CONFIG_ATH79_MACH_DIR_505_A1=y
CONFIG_ATH79_MACH_DIR_600_A1=y
CONFIG_ATH79_MACH_DIR_615_C1=y
@@ -120,6 +121,7 @@ CONFIG_ATH79_MACH_WNDR3700=y
CONFIG_ATH79_MACH_WNDR4300=y
CONFIG_ATH79_MACH_WNR2000=y
CONFIG_ATH79_MACH_WNR2000_V3=y
+CONFIG_ATH79_MACH_WNR2000_V4=y
CONFIG_ATH79_MACH_WNR2200=y
CONFIG_ATH79_MACH_WP543=y
CONFIG_ATH79_MACH_WPE72=y
@@ -246,7 +248,6 @@ CONFIG_MTD_REDBOOT_PARTS=y
CONFIG_MTD_SPLIT_FIRMWARE=y
CONFIG_MTD_SPLIT_LZMA_FW=y
CONFIG_MTD_SPLIT_SEAMA_FW=y
-CONFIG_MTD_SPLIT_SQUASHFS_ROOT=y
CONFIG_MTD_SPLIT_UIMAGE_FW=y
CONFIG_MTD_TPLINK_PARTS=y
CONFIG_MTD_WRT160NL_PARTS=y