summaryrefslogtreecommitdiff
path: root/target/linux/config
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-05-12 15:25:33 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-05-13 13:45:18 +0200
commit8ef3a1254c0be613a7e44e7ebf99f1d6e679b48b (patch)
treeb778fec35564689f79f7a96ce35444a9f57f0064 /target/linux/config
parent05d715df3ac052fb41a5ab42369d05a3e2a82de3 (diff)
resolve merge
Diffstat (limited to 'target/linux/config')
-rw-r--r--target/linux/config/Config.in.netfilter.ip41
1 files changed, 0 insertions, 1 deletions
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