commit 29c36262383d37c6149cf26afd39c3389dd23135
author Igor Maravić <igorm@etf.rs> Mon Dec 12 02:58:23 2011 +0000
committer David S. Miller <davem@davemloft.net> Fri Dec 16 15:49:52 2011 -0500
tree 57d48430712805644fab9aa52ad41d3792e281e6
parent a3bf7ae9ae1036636d8900b35a3880e871eceb39

net:x25: 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/x25/x25_route.c

diff --git a/net/x25/x25_route.c b/net/x25/x25_route.c
index 97d77c5..cf63662 100644
--- a/net/x25/x25_route.c
+++ b/net/x25/x25_route.c
@@ -134,7 +134,7 @@
 
 	if (dev &&
 	    (!(dev->flags & IFF_UP) || (dev->type != ARPHRD_X25
-#if defined(CONFIG_LLC) || defined(CONFIG_LLC_MODULE)
+#if IS_ENABLED(CONFIG_LLC)
 					&& dev->type != ARPHRD_ETHER
 #endif
 					))){