---

yaml --- r: 7548 b: refs/heads/master c: 31c913e h: refs/heads/master v: v3
git-mirror · Sep 6, 2005 · 66d8d97 · 66d8d97
1 parent d2b335b
commit 66d8d97
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a2978aea393b5e00b55b219786a5b8a47f838a7f
+refs/heads/master: 31c913e7fd48000163a88cfe10383fd3be20910e
diff --git a/trunk/net/ipv4/netfilter/Kconfig b/trunk/net/ipv4/netfilter/Kconfig
@@ -34,6 +34,7 @@ config IP_NF_CT_ACCT
 
 config IP_NF_CONNTRACK_MARK
 	bool  'Connection mark tracking support'
+	depends on IP_NF_CONNTRACK
 	help
 	  This option enables support for connection marks, used by the
 	  `CONNMARK' target and `connmark' match. Similar to the mark value