aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/config-3.18
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2014-11-24 10:17:33 +0000
committerImre Kaloz <kaloz@openwrt.org>2014-11-24 10:17:33 +0000
commitc26c5eff0ea43f9645fdb50b8dfd5f1fe4fb6640 (patch)
tree71f8de7a390beace28d8456266cad646ffdf46f5 /target/linux/generic/config-3.18
parent35902404fce9e8007a69ba893a8a8e569494209e (diff)
downloadupstream-c26c5eff0ea43f9645fdb50b8dfd5f1fe4fb6640.tar.gz
upstream-c26c5eff0ea43f9645fdb50b8dfd5f1fe4fb6640.tar.bz2
upstream-c26c5eff0ea43f9645fdb50b8dfd5f1fe4fb6640.zip
update .18 support for -rc6
Signed-off-by: Imre Kaloz <kaloz@openwrt.org> SVN-Revision: 43357
Diffstat (limited to 'target/linux/generic/config-3.18')
-rw-r--r--target/linux/generic/config-3.1812
1 files changed, 10 insertions, 2 deletions
diff --git a/target/linux/generic/config-3.18 b/target/linux/generic/config-3.18
index ad8ea95e9d..cfee63e2f9 100644
--- a/target/linux/generic/config-3.18
+++ b/target/linux/generic/config-3.18
@@ -146,6 +146,7 @@ CONFIG_ARCH_FLATMEM_ENABLE=y
# CONFIG_ARCH_HAS_ILOG2_U64 is not set
# CONFIG_ARCH_HI3xxx is not set
# CONFIG_ARCH_HIGHBANK is not set
+# CONFIG_ARCH_HISI is not set
# CONFIG_ARCH_INTEGRATOR is not set
# CONFIG_ARCH_IOP13XX is not set
# CONFIG_ARCH_IOP32X is not set
@@ -157,7 +158,10 @@ CONFIG_ARCH_FLATMEM_ENABLE=y
# CONFIG_ARCH_KIRKWOOD is not set
# CONFIG_ARCH_KS8695 is not set
# CONFIG_ARCH_LPC32XX is not set
+# CONFIG_ARCH_MEDIATEK is not set
+# CONFIG_ARCH_MESON is not set
# CONFIG_ARCH_MMP is not set
+# CONFIG_ARCH_MSM is not set
# CONFIG_ARCH_MSM_DT is not set
# CONFIG_ARCH_MSM_NODT is not set
# CONFIG_ARCH_MULTIPLATFORM is not set
@@ -181,6 +185,7 @@ CONFIG_ARCH_FLATMEM_ENABLE=y
# CONFIG_ARCH_PNX4008 is not set
# CONFIG_ARCH_PRIMA2 is not set
# CONFIG_ARCH_PXA is not set
+# CONFIG_ARCH_QCOM is not set
# CONFIG_ARCH_REALVIEW is not set
# CONFIG_ARCH_ROCKCHIP is not set
# CONFIG_ARCH_RPC is not set
@@ -1070,6 +1075,7 @@ CONFIG_FILE_LOCKING=y
CONFIG_FLATMEM=y
CONFIG_FLATMEM_MANUAL=y
CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_FM10K is not set
# CONFIG_FMC is not set
# CONFIG_FORCEDETH is not set
CONFIG_FORCE_MAX_ZONEORDER=11
@@ -1079,6 +1085,7 @@ CONFIG_FRAME_WARN=1024
# CONFIG_FREEZER is not set
# CONFIG_FRONTSWAP is not set
# CONFIG_FSCACHE is not set
+# CONFIG_FSL_EDMA is not set
# CONFIG_FSL_XGMAC_MDIO is not set
CONFIG_FSNOTIFY=y
# CONFIG_FS_POSIX_ACL is not set
@@ -1598,7 +1605,6 @@ CONFIG_IP_MULTIPLE_TABLES=y
# CONFIG_IP_NF_MATCH_ECN is not set
# CONFIG_IP_NF_MATCH_RPFILTER is not set
# CONFIG_IP_NF_MATCH_TTL is not set
-# CONFIG_IP_NF_NAT is not set
# CONFIG_IP_NF_QUEUE is not set
# CONFIG_IP_NF_RAW is not set
# CONFIG_IP_NF_SECURITY is not set
@@ -2207,6 +2213,7 @@ CONFIG_MTD_ROOTFS_ROOT_DEV=y
CONFIG_MTD_ROOTFS_SPLIT=y
# CONFIG_MTD_SLRAM is not set
# CONFIG_MTD_SM_COMMON is not set
+# CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set
# CONFIG_MTD_SPI_NOR is not set
# CONFIG_MTD_SPINAND_MT29F is not set
CONFIG_MTD_SPLIT=y
@@ -2232,6 +2239,7 @@ CONFIG_MTD_SPLIT_SQUASHFS_ROOT=y
# CONFIG_NATIONAL_PHY is not set
# CONFIG_NATSEMI is not set
# CONFIG_NAU7802 is not set
+# CONFIG_NBPFAXI_DMA is not set
# CONFIG_NCP_FS is not set
# CONFIG_NE2000 is not set
# CONFIG_NE2K_PCI is not set
@@ -2300,7 +2308,6 @@ CONFIG_NETDEV_1000=y
# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
# CONFIG_NETFILTER_XT_MATCH_TIME is not set
# CONFIG_NETFILTER_XT_MATCH_U32 is not set
-# CONFIG_NETFILTER_XT_NAT is not set
# CONFIG_NETFILTER_XT_TARGET_AUDIT is not set
# CONFIG_NETFILTER_XT_TARGET_CHECKSUM is not set
# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
@@ -3793,6 +3800,7 @@ CONFIG_TEXTSEARCH=y
# CONFIG_TEXTSEARCH_FSM is not set
# CONFIG_TEXTSEARCH_KMP is not set
# CONFIG_THERMAL is not set
+# CONFIG_THERMAL_GOV_BANG_BANG is not set
# CONFIG_THERMAL_HWMON is not set
# CONFIG_THRUSTMASTER_FF is not set
# CONFIG_THUNDERBOLT is not set