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