diff options
author | Jeff Hatch <Jeff.Hatch@multitech.com> | 2017-10-06 12:36:59 -0500 |
---|---|---|
committer | Jeff Hatch <Jeff.Hatch@multitech.com> | 2017-10-06 12:36:59 -0500 |
commit | 970dc59776b754c51a887f9b2ec4c7bb98589a43 (patch) | |
tree | bb4025d3be47132e415b17f327b79be5f19dc73e /recipes-kernel/linux/linux-3.12.70/mtcdt | |
parent | e95e175cb545536722ebe845cd8a4f70b189dd1d (diff) | |
parent | f5ff7bc9e79ee975be063eb305423ecdd65ca2b3 (diff) | |
download | meta-multitech-atmel-970dc59776b754c51a887f9b2ec4c7bb98589a43.tar.gz meta-multitech-atmel-970dc59776b754c51a887f9b2ec4c7bb98589a43.tar.bz2 meta-multitech-atmel-970dc59776b754c51a887f9b2ec4c7bb98589a43.zip |
Merge branch 'master' of gitlab.multitech.net:mirrors/meta-multitech
Diffstat (limited to 'recipes-kernel/linux/linux-3.12.70/mtcdt')
-rw-r--r-- | recipes-kernel/linux/linux-3.12.70/mtcdt/defconfig | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/recipes-kernel/linux/linux-3.12.70/mtcdt/defconfig b/recipes-kernel/linux/linux-3.12.70/mtcdt/defconfig index 88608ca..28070c7 100644 --- a/recipes-kernel/linux/linux-3.12.70/mtcdt/defconfig +++ b/recipes-kernel/linux/linux-3.12.70/mtcdt/defconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 3.12.27 Kernel Configuration +# Linux/arm 3.12.70 Kernel Configuration # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -83,7 +83,6 @@ CONFIG_TICK_CPU_ACCOUNTING=y # RCU Subsystem # CONFIG_TREE_PREEMPT_RCU=y -# CONFIG_TINY_RCU is not set CONFIG_PREEMPT_RCU=y CONFIG_RCU_STALL_COMMON=y CONFIG_RCU_FANOUT=32 @@ -624,7 +623,7 @@ CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y # CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set # CONFIG_NETFILTER_XT_TARGET_RATEEST is not set CONFIG_NETFILTER_XT_TARGET_REDIRECT=y -# CONFIG_NETFILTER_XT_TARGET_TEE is not set +CONFIG_NETFILTER_XT_TARGET_TEE=m # CONFIG_NETFILTER_XT_TARGET_TPROXY is not set # CONFIG_NETFILTER_XT_TARGET_TRACE is not set # CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set @@ -648,7 +647,7 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y # CONFIG_NETFILTER_XT_MATCH_DSCP is not set CONFIG_NETFILTER_XT_MATCH_ECN=y # CONFIG_NETFILTER_XT_MATCH_ESP is not set -CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=y +CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m # CONFIG_NETFILTER_XT_MATCH_HELPER is not set CONFIG_NETFILTER_XT_MATCH_HL=y # CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set @@ -964,7 +963,7 @@ CONFIG_MTD_CFI_I2=y # # CONFIG_MTD_DATAFLASH is not set CONFIG_MTD_M25P80=m - +CONFIG_M25PXX_USE_FAST_READ=y # CONFIG_MTD_SST25L is not set # CONFIG_MTD_SLRAM is not set # CONFIG_MTD_PHRAM is not set |