diff --git a/[refs] b/[refs]
index 6c8196ec52b6..e62c26571b51 100644
--- 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
index aba0bb2da92d..c8b2bdbaf91b 100644
--- 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 */