diff options
author | Alex Shi <alex.shi@linaro.org> | 2017-03-20 12:03:07 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2017-03-20 12:03:07 +0800 |
commit | 1c563c0006661025d7a6c9bc85fc889a4e8a1c06 (patch) | |
tree | 93d455583031d0cacebfd436d5b2118a536de5f7 /arch/mips/configs/malta_defconfig | |
parent | 71205f3b80da389c52cc2611f59e183a77c56f4f (diff) | |
parent | 28ec98bc2e4a175b60f45d505e715a33b93dd077 (diff) |
Merge tag 'v4.4.55' into linux-linaro-lsk-v4.4lsk-v4.4-17.03
This is the 4.4.55 stable release
Diffstat (limited to 'arch/mips/configs/malta_defconfig')
-rw-r--r-- | arch/mips/configs/malta_defconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/configs/malta_defconfig b/arch/mips/configs/malta_defconfig index 5afb4840aec7..739ccd0dca64 100644 --- a/arch/mips/configs/malta_defconfig +++ b/arch/mips/configs/malta_defconfig @@ -59,8 +59,8 @@ CONFIG_NETFILTER=y CONFIG_NF_CONNTRACK=m CONFIG_NF_CONNTRACK_SECMARK=y CONFIG_NF_CONNTRACK_EVENTS=y -CONFIG_NF_CT_PROTO_DCCP=m -CONFIG_NF_CT_PROTO_UDPLITE=m +CONFIG_NF_CT_PROTO_DCCP=y +CONFIG_NF_CT_PROTO_UDPLITE=y CONFIG_NF_CONNTRACK_AMANDA=m CONFIG_NF_CONNTRACK_FTP=m CONFIG_NF_CONNTRACK_H323=m |