diff options
| author | Igor Maravić <igorm@etf.rs> | 2011-12-12 02:58:23 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-12-16 15:49:52 -0500 |
| commit | 29c36262383d37c6149cf26afd39c3389dd23135 (patch) | |
| tree | 57d48430712805644fab9aa52ad41d3792e281e6 /net/x25/x25_route.c | |
| parent | a3bf7ae9ae1036636d8900b35a3880e871eceb39 (diff) | |
| download | linux-29c36262383d37c6149cf26afd39c3389dd23135.tar.bz2 | |
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>
Diffstat (limited to 'net/x25/x25_route.c')
| -rw-r--r-- | net/x25/x25_route.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 ))){ |