summaryrefslogtreecommitdiffstats
path: root/arch/m68k/configs/multi_defconfig
diff options
context:
space:
mode:
authorCong Wang <xiyou.wangcong@gmail.com>2012-08-25 22:23:39 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2012-09-03 13:36:40 +0200
commit965505015beccc4ec900798070165875b8e8dccf (patch)
treed0b8c14bd1c4818b6ae471d6d1d043e5d8962e39 /arch/m68k/configs/multi_defconfig
parentnetfilter: nf_conntrack: add nf_ct_timeout_lookup (diff)
downloadlinux-965505015beccc4ec900798070165875b8e8dccf.tar.xz
linux-965505015beccc4ec900798070165875b8e8dccf.zip
netfilter: remove xt_NOTRACK
It was scheduled to be removed for a long time. Cc: Pablo Neira Ayuso <pablo@netfilter.org> Cc: Patrick McHardy <kaber@trash.net> Cc: "David S. Miller" <davem@davemloft.net> Cc: netfilter@vger.kernel.org Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'arch/m68k/configs/multi_defconfig')
-rw-r--r--arch/m68k/configs/multi_defconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/m68k/configs/multi_defconfig b/arch/m68k/configs/multi_defconfig
index 55d394edf633..8d5def4a31e0 100644
--- a/arch/m68k/configs/multi_defconfig
+++ b/arch/m68k/configs/multi_defconfig
@@ -80,7 +80,6 @@ CONFIG_NETFILTER_XT_TARGET_DSCP=m
CONFIG_NETFILTER_XT_TARGET_MARK=m
CONFIG_NETFILTER_XT_TARGET_NFLOG=m
CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
CONFIG_NETFILTER_XT_TARGET_TRACE=m
CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m