From 5cfd714a2eb14798f3f87b3d66af3798ad3c2175 Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Mon, 20 Oct 2008 03:31:17 -0700 Subject: [PATCH] --- yaml --- r: 116055 b: refs/heads/master c: 041fb574c75a570a0796acd3ed83e4ce0ea920f4 h: refs/heads/master i: 116053: 61a7e9d11ac0e078bf71061508ca809d3352c485 116051: 0d35711c5e488883c8d5dec14fc9fdbfd5582c13 116047: 87e2a9883fd348f83006f8ab68458e858483be63 v: v3 --- [refs] | 2 +- trunk/net/netfilter/Kconfig | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 371fccfc41b5..866167bfd1f8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9f3ffae0dbce491a3e9871b686342fd5aa854f05 +refs/heads/master: 041fb574c75a570a0796acd3ed83e4ce0ea920f4 diff --git a/trunk/net/netfilter/Kconfig b/trunk/net/netfilter/Kconfig index 78892cf2b021..25dcef9f2194 100644 --- a/trunk/net/netfilter/Kconfig +++ b/trunk/net/netfilter/Kconfig @@ -271,7 +271,6 @@ config NF_CONNTRACK_TFTP config NF_CT_NETLINK tristate 'Connection tracking netlink interface' select NETFILTER_NETLINK - depends on NF_NAT=n || NF_NAT default m if NETFILTER_ADVANCED=n help This option enables support for a netlink-based userspace interface