From patchwork Wed Sep 14 15:26:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhu Yanjun X-Patchwork-Id: 671393 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3scTrZ5Ycnz9t0p for ; Sun, 18 Sep 2016 23:09:50 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932514AbcIRNJc (ORCPT ); Sun, 18 Sep 2016 09:09:32 -0400 Received: from [222.129.209.39] ([222.129.209.39]:54738 "EHLO mail.rain.com" rhost-flags-FAIL-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1753457AbcIRNJa (ORCPT ); Sun, 18 Sep 2016 09:09:30 -0400 X-Greylist: delayed 832 seconds by postgrey-1.27 at vger.kernel.org; Sun, 18 Sep 2016 09:09:29 EDT Received: from mail.rain.com (unknown [192.168.2.102]) by mail.rain.com (Postfix) with ESMTPA id 08EB15C2F6A; Wed, 14 Sep 2016 23:26:59 +0800 (CST) From: zyjzyj2000@gmail.com To: netdev@vger.kernel.org, intel-wired-lan@lists.osuosl.org, jeffrey.t.kirsher@intel.com, zyjzyj2000@gmail.com, e1000-devel@lists.sourceforge.net Subject: [PATCH 1/1] ixgbe: replace defined with IS_ENABLED Date: Wed, 14 Sep 2016 23:26:54 +0800 Message-Id: <1473866814-21374-1-git-send-email-zyjzyj2000@gmail.com> X-Mailer: git-send-email 2.7.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Zhu Yanjun Replace defined macro with IS_ENABLED in ixgbe.h file Signed-off-by: Zhu Yanjun --- drivers/net/ethernet/intel/ixgbe/ixgbe.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe.h b/drivers/net/ethernet/intel/ixgbe/ixgbe.h index 9475ff9..f8bc1d0 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe.h +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe.h @@ -45,7 +45,7 @@ #include "ixgbe_type.h" #include "ixgbe_common.h" #include "ixgbe_dcb.h" -#if defined(CONFIG_FCOE) || defined(CONFIG_FCOE_MODULE) +#if IS_ENABLED(CONFIG_FCOE) #define IXGBE_FCOE #include "ixgbe_fcoe.h" #endif /* CONFIG_FCOE or CONFIG_FCOE_MODULE */