commit e6373c4c0ecb3a944c34117a3daeac315d641b5f
author Igor Maravić <igorm@etf.rs> Mon Dec 12 02:58:25 2011 +0000
committer David S. Miller <davem@davemloft.net> Fri Dec 16 15:49:52 2011 -0500
tree 25f21dc82327c56474b0e894c832faef084c176b
parent c0cd115667bcd23c2a31fe2114beaab3608de68c

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>

net/bridge/br_fdb.c

diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c
index a1429af..f963f6b1 100644
--- a/net/bridge/br_fdb.c
+++ b/net/bridge/br_fdb.c
@@ -247,7 +247,7 @@
 	return NULL;
 }
 
-#if defined(CONFIG_ATM_LANE) || defined(CONFIG_ATM_LANE_MODULE)
+#if IS_ENABLED(CONFIG_ATM_LANE)
 /* Interface used by ATM LANE hook to test
  * if an addr is on some other bridge port */
 int br_fdb_test_addr(struct net_device *dev, unsigned char *addr)