---

yaml --- r: 116055 b: refs/heads/master c: 041fb57 h: refs/heads/master i: 116053: 61a7e9d 116051: 0d35711 116047: 87e2a98 v: v3
git-mirror · Oct 20, 2008 · 5cfd714 · 5cfd714
1 parent 5340fe6
commit 5cfd714
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git 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
@@ -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