From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932675Ab3FFKFP (ORCPT ); Thu, 6 Jun 2013 06:05:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:9662 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932079Ab3FFKFM (ORCPT ); Thu, 6 Jun 2013 06:05:12 -0400 From: Jason Wang To: davem@davemloft.net, mst@redhat.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: sergei.shtylyov@cogentembedded.com, Jason Wang Subject: [net-next PATCH 3/8] macvlan: switch to use IS_ENABLED() Date: Thu, 6 Jun 2013 17:54:35 +0800 Message-Id: <1370512480-14272-4-git-send-email-jasowang@redhat.com> In-Reply-To: <1370512480-14272-1-git-send-email-jasowang@redhat.com> References: <1370512480-14272-1-git-send-email-jasowang@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Acked-by: Michael S. Tsirkin Signed-off-by: Jason Wang --- 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 #include -#if defined(CONFIG_MACVTAP) || defined(CONFIG_MACVTAP_MODULE) +#if IS_ENABLED(CONFIG_MACVTAP) struct socket *macvtap_get_socket(struct file *); #else #include -- 1.7.1