diff options
author | Igor Maravić <igorm@etf.rs> | 2011-12-11 21:58:25 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-12-16 15:49:52 -0500 |
commit | e6373c4c0ecb3a944c34117a3daeac315d641b5f (patch) | |
tree | 25f21dc82327c56474b0e894c832faef084c176b /net/bridge/br_private.h | |
parent | c0cd115667bcd23c2a31fe2114beaab3608de68c (diff) |
net:bridge: 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/bridge/br_private.h')
-rw-r--r-- | net/bridge/br_private.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h index 57dcd1489f3f..0b67a63ad7a8 100644 --- a/net/bridge/br_private.h +++ b/net/bridge/br_private.h | |||
@@ -537,7 +537,7 @@ extern void br_stp_port_timer_init(struct net_bridge_port *p); | |||
537 | extern unsigned long br_timer_value(const struct timer_list *timer); | 537 | extern unsigned long br_timer_value(const struct timer_list *timer); |
538 | 538 | ||
539 | /* br.c */ | 539 | /* br.c */ |
540 | #if defined(CONFIG_ATM_LANE) || defined(CONFIG_ATM_LANE_MODULE) | 540 | #if IS_ENABLED(CONFIG_ATM_LANE) |
541 | extern int (*br_fdb_test_addr_hook)(struct net_device *dev, unsigned char *addr); | 541 | extern int (*br_fdb_test_addr_hook)(struct net_device *dev, unsigned char *addr); |
542 | #endif | 542 | #endif |
543 | 543 | ||