net:x25: use IS_ENABLED

[deliverable/linux.git] / net / x25 / x25_dev.c

diff --git a/net/x25/x25_dev.c b/net/x25/x25_dev.c
index fa2b41888bd9a78b931ff6a6be418de56498fe6b..f0ce862d1f46309b5482e7594be438e6744e2566 100644 (file)
--- a/net/x25/x25_dev.c
+++ b/net/x25/x25_dev.c
@@ -161,7 +161,7 @@ void x25_establish_link(struct x25_neigh *nb)
                *ptr = X25_IFACE_CONNECT;
                break;
 
-#if defined(CONFIG_LLC) || defined(CONFIG_LLC_MODULE)
+#if IS_ENABLED(CONFIG_LLC)
        case ARPHRD_ETHER:
                return;
 #endif
@@ -180,7 +180,7 @@ void x25_terminate_link(struct x25_neigh *nb)
        struct sk_buff *skb;
        unsigned char *ptr;
 
-#if defined(CONFIG_LLC) || defined(CONFIG_LLC_MODULE)
+#if IS_ENABLED(CONFIG_LLC)
        if (nb->dev->type == ARPHRD_ETHER)
                return;
 #endif
@@ -213,7 +213,7 @@ void x25_send_frame(struct sk_buff *skb, struct x25_neigh *nb)
                *dptr = X25_IFACE_DATA;
                break;
 
-#if defined(CONFIG_LLC) || defined(CONFIG_LLC_MODULE)
+#if IS_ENABLED(CONFIG_LLC)
        case ARPHRD_ETHER:
                kfree_skb(skb);
                return;