From patchwork Wed Sep 26 12:06:20 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [V4,3/7] ipvs: Use config macro IS_ENABLED() Date: Wed, 26 Sep 2012 02:06:20 -0000 From: Jesper Dangaard Brouer X-Patchwork-Id: 187052 Message-Id: <20120926120616.24804.45927.stgit@dragon> To: Hans Schillstrom , Hans Schillstrom , netdev@vger.kernel.org, Pablo Neira Ayuso , lvs-devel@vger.kernel.org, Julian Anastasov Cc: Jesper Dangaard Brouer , "Patrick McHardy" , Thomas Graf , Wensong Zhang , netfilter-devel@vger.kernel.org, Simon Horman Cleanup patch. Use the IS_ENABLED macro, instead of having to check both the build and the module CONFIG_ option. Signed-off-by: Jesper Dangaard Brouer --- include/net/ip_vs.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h index aba0bb2..c8b2bdb 100644 --- a/include/net/ip_vs.h +++ b/include/net/ip_vs.h @@ -22,7 +22,7 @@ #include #include /* for struct ipv6hdr */ #include -#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE) +#if IS_ENABLED(CONFIG_NF_CONNTRACK) #include #endif #include /* Netw namespace */