From 29c36262383d37c6149cf26afd39c3389dd23135 Mon Sep 17 00:00:00 2001 From: Igor Maravić Date: Mon, 12 Dec 2011 02:58:23 +0000 Subject: net:x25: use IS_ENABLED MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use IS_ENABLED(CONFIG_FOO) instead of defined(CONFIG_FOO) || defined (CONFIG_FOO_MODULE) Signed-off-by: Igor Maravić Signed-off-by: David S. Miller --- net/x25/x25_route.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'net/x25/x25_route.c') diff --git a/net/x25/x25_route.c b/net/x25/x25_route.c index 97d77c532d8c..cf6366270054 100644 --- a/net/x25/x25_route.c +++ b/net/x25/x25_route.c @@ -134,7 +134,7 @@ struct net_device *x25_dev_get(char *devname) 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 ))){ -- cgit v1.2.3-70-g09d2