>-----Original Message----- >From: [email protected] [mailto:[email protected]] On >Behalf Of [email protected] >Sent: Wednesday, September 14, 2016 8:27 AM >To: [email protected]; [email protected]; Kirsher, >Jeffrey T <[email protected]>; [email protected]; e1000- >[email protected] >Subject: [PATCH 1/1] ixgbe: replace defined with IS_ENABLED > >From: Zhu Yanjun <[email protected]> > >Replace defined macro with IS_ENABLED in ixgbe.h file > >Signed-off-by: Zhu Yanjun <[email protected]> >--- > 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 */ >-- >2.7.4
Already taken care of by the following patch: http://patchwork.ozlabs.org/patch/668894/ Thanks, Emil ------------------------------------------------------------------------------ _______________________________________________ E1000-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/e1000-devel To learn more about Intel® Ethernet, visit http://communities.intel.com/community/wired
