diff options
| author | Igor Maravić | 2011-12-12 03:58:24 +0100 |
|---|---|---|
| committer | David S. Miller | 2011-12-16 21:49:52 +0100 |
| commit | c0cd115667bcd23c2a31fe2114beaab3608de68c (patch) | |
| tree | 886a94793dcbe9797c593d465aa4f37039231422 /net/netfilter/nf_conntrack_core.c | |
| parent | net:x25: use IS_ENABLED (diff) | |
| download | kernel-qcow2-linux-c0cd115667bcd23c2a31fe2114beaab3608de68c.tar.gz kernel-qcow2-linux-c0cd115667bcd23c2a31fe2114beaab3608de68c.tar.xz kernel-qcow2-linux-c0cd115667bcd23c2a31fe2114beaab3608de68c.zip | |
net:netfilter: use IS_ENABLED
Use IS_ENABLED(CONFIG_FOO)
instead of defined(CONFIG_FOO) || defined (CONFIG_FOO_MODULE)
Signed-off-by: Igor Maravić <igorm@etf.rs>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter/nf_conntrack_core.c')
| -rw-r--r-- | net/netfilter/nf_conntrack_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c index 7202b0631cd6..32279dcd03cf 100644 --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c @@ -1087,7 +1087,7 @@ static struct nf_ct_ext_type nf_ct_zone_extend __read_mostly = { }; #endif -#if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE) +#if IS_ENABLED(CONFIG_NF_CT_NETLINK) #include <linux/netfilter/nfnetlink.h> #include <linux/netfilter/nfnetlink_conntrack.h> |