From: Jason Wang <jasowang@redhat.com>
Date: Wed, 5 Jun 2013 23:54:35 +0000 (+0000)
Subject: macvlan: switch to use IS_ENABLED()
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1d2f41ed23343e083566339574807ca7ea75dbba;p=linux-beck.git

macvlan: switch to use IS_ENABLED()

Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/include/linux/if_macvlan.h b/include/linux/if_macvlan.h
index 84dde1dd1da4..e47ad46a477c 100644
--- a/include/linux/if_macvlan.h
+++ b/include/linux/if_macvlan.h
@@ -8,7 +8,7 @@
 #include <net/netlink.h>
 #include <linux/u64_stats_sync.h>
 
-#if defined(CONFIG_MACVTAP) || defined(CONFIG_MACVTAP_MODULE)
+#if IS_ENABLED(CONFIG_MACVTAP)
 struct socket *macvtap_get_socket(struct file *);
 #else
 #include <linux/err.h>