From c02fb1047262f6d25e1a2191cb11b6e79cee83ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Maravi=C4=87?= <igorm@etf.rs>
Date: Mon, 12 Dec 2011 02:58:23 +0000
Subject: [PATCH] --- yaml --- r: 278830 b: refs/heads/master c:
 29c36262383d37c6149cf26afd39c3389dd23135 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/net/x25/af_x25.c    | 2 +-
 trunk/net/x25/x25_dev.c   | 6 +++---
 trunk/net/x25/x25_route.c | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 248bf14051cb..2c54ae10095c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a3bf7ae9ae1036636d8900b35a3880e871eceb39
+refs/heads/master: 29c36262383d37c6149cf26afd39c3389dd23135
diff --git a/trunk/net/x25/af_x25.c b/trunk/net/x25/af_x25.c
index 3e16c6abde4f..a306bc66000e 100644
--- a/trunk/net/x25/af_x25.c
+++ b/trunk/net/x25/af_x25.c
@@ -232,7 +232,7 @@ static int x25_device_event(struct notifier_block *this, unsigned long event,
 		return NOTIFY_DONE;
 
 	if (dev->type == ARPHRD_X25
-#if defined(CONFIG_LLC) || defined(CONFIG_LLC_MODULE)
+#if IS_ENABLED(CONFIG_LLC)
 	 || dev->type == ARPHRD_ETHER
 #endif
 	 ) {
diff --git a/trunk/net/x25/x25_dev.c b/trunk/net/x25/x25_dev.c
index fa2b41888bd9..f0ce862d1f46 100644
--- a/trunk/net/x25/x25_dev.c
+++ b/trunk/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;
diff --git a/trunk/net/x25/x25_route.c b/trunk/net/x25/x25_route.c
index 97d77c532d8c..cf6366270054 100644
--- a/trunk/net/x25/x25_route.c
+++ b/trunk/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
 					))){