Message ID | 1369278753-2533-2-git-send-email-jasowang@redhat.com |
---|---|
State | RFC, archived |
Delegated to: | David Miller |
Headers | show |
On Thu, May 23, 2013 at 11:12:26AM +0800, Jason Wang wrote: > Signed-off-by: Jason Wang <jasowang@redhat.com> Acked-by: Michael S. Tsirkin <mst@redhat.com> > --- > include/linux/if_macvlan.h | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/include/linux/if_macvlan.h b/include/linux/if_macvlan.h > index 84dde1d..e47ad46 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> > -- > 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/include/linux/if_macvlan.h b/include/linux/if_macvlan.h index 84dde1d..e47ad46 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>
Signed-off-by: Jason Wang <jasowang@redhat.com> --- include/linux/if_macvlan.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)