---

yaml --- r: 340501 b: refs/heads/master c: a638e51 h: refs/heads/master i: 340499: 1f00de7 v: v3
git-mirror · Sep 28, 2012 · 0f2d3f5 · 0f2d3f5
1 parent cf15f3f
commit 0f2d3f5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2fab8917f480942c43275e231c0647838e02dc2b
+refs/heads/master: a638e51437f5efd00c4579df56cfd4d497ed51a8
diff --git a/trunk/include/net/ip_vs.h b/trunk/include/net/ip_vs.h
@@ -22,7 +22,7 @@
 #include <linux/ip.h>
 #include <linux/ipv6.h>			/* for struct ipv6hdr */
 #include <net/ipv6.h>
-#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
+#if IS_ENABLED(CONFIG_NF_CONNTRACK)
 #include <net/netfilter/nf_conntrack.h>
 #endif
 #include <net/net_namespace.h>		/* Netw namespace */