From 8ef3a1254c0be613a7e44e7ebf99f1d6e679b48b Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 12 May 2014 15:25:33 +0200 Subject: resolve merge --- target/linux/config/Config.in.netfilter.ip4 | 1 - 1 file changed, 1 deletion(-) (limited to 'target') diff --git a/target/linux/config/Config.in.netfilter.ip4 b/target/linux/config/Config.in.netfilter.ip4 index 3641f1120..1cc41c741 100644 --- a/target/linux/config/Config.in.netfilter.ip4 +++ b/target/linux/config/Config.in.netfilter.ip4 @@ -18,7 +18,6 @@ config ADK_KERNEL_IP_NF_CT_ACCT Those counters can be used for flow-based accounting or the `connbytes' match. - config ADK_KERNEL_IP_NF_IPTABLES tristate 'IP tables support (required for filtering/masq/NAT)' select ADK_KERNEL_NETFILTER_XTABLES -- cgit v1.2.3