From: Dmitry Kravkov Date: Mon, 29 Aug 2011 11:35:44 +0000 (+0000) Subject: bnx2x: Fix build error X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3857e3ee2209b7289c434103e366f765ec82a22d;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git bnx2x: Fix build error On Mon, 2011-08-29 at 13:28 -0700, Randy Dunlap wrote: > (on i386 or x86_64) > > drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c:10148: error: 'bnx2x_fcoe_get_wwn' undeclared here (not in a function) This should sync #define structures between definition and declaration Acked-by: Randy Dunlap Reported-by: Randy Dunlap Signed-off-by: Dmitry Kravkov Acked-by: Randy Dunlap Signed-off-by: David S. Miller --- diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h index f290b23e57e7..5b1f9b5ec499 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h @@ -522,7 +522,7 @@ void bnx2x_free_mem_bp(struct bnx2x *bp); */ int bnx2x_change_mtu(struct net_device *dev, int new_mtu); -#if defined(BCM_CNIC) && (defined(CONFIG_FCOE) || defined(CONFIG_FCOE_MODULE)) +#if defined(NETDEV_FCOE_WWNN) && defined(BCM_CNIC) /** * bnx2x_fcoe_get_wwn - return the requested WWN value for this port *