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
commit4ac29a2396a2a0d75fb466b36ae74a8664795ed4 (patch)
tree920bf0dc18fbfffdf46207bbfbd1e9ad0fc8b46a /target/linux/ar71xx/config-3.14
parente238d1b161efa171d4a8bc9abe79a413d15135ca (diff)
downloadupstream-4ac29a2396a2a0d75fb466b36ae74a8664795ed4.tar.gz
upstream-4ac29a2396a2a0d75fb466b36ae74a8664795ed4.tar.bz2
upstream-4ac29a2396a2a0d75fb466b36ae74a8664795ed4.zip
ar71xx: merge changes from 3.10 that were forgotten for 3.14
Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43347 3c298f89-4303-0410-b956-a3cf2f4a3e73
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