diff options
author | Igor Maravić <igorm@etf.rs> | 2011-12-11 21:58:23 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-12-16 15:49:52 -0500 |
commit | 29c36262383d37c6149cf26afd39c3389dd23135 (patch) | |
tree | 57d48430712805644fab9aa52ad41d3792e281e6 /net/x25/af_x25.c | |
parent | a3bf7ae9ae1036636d8900b35a3880e871eceb39 (diff) |
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/af_x25.c')
-rw-r--r-- | net/x25/af_x25.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c index 3e16c6abde4..a306bc66000 100644 --- a/net/x25/af_x25.c +++ b/net/x25/af_x25.c | |||
@@ -232,7 +232,7 @@ static int x25_device_event(struct notifier_block *this, unsigned long event, | |||
232 | return NOTIFY_DONE; | 232 | return NOTIFY_DONE; |
233 | 233 | ||
234 | if (dev->type == ARPHRD_X25 | 234 | if (dev->type == ARPHRD_X25 |
235 | #if defined(CONFIG_LLC) || defined(CONFIG_LLC_MODULE) | 235 | #if IS_ENABLED(CONFIG_LLC) |
236 | || dev->type == ARPHRD_ETHER | 236 | || dev->type == ARPHRD_ETHER |
237 | #endif | 237 | #endif |
238 | ) { | 238 | ) { |