From 5201e3c33426d0171572d26e7d550cb4c5548328 Mon Sep 17 00:00:00 2001 From: Dmitry Kravkov Date: Mon, 29 Aug 2011 11:35:44 +0000 Subject: [PATCH] --- yaml --- r: 265707 b: refs/heads/master c: 3857e3ee2209b7289c434103e366f765ec82a22d h: refs/heads/master i: 265705: 0ccd054f9aa6e1ceaf131855dde0cdf0628545bf 265703: 8d33b5b927e14c8db0288bc147301ce2829b0e4a v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 880713c6ed3e..6049203f74c9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5cbba3cd9db44d171673405d71b9aa0e35accdd1 +refs/heads/master: 3857e3ee2209b7289c434103e366f765ec82a22d diff --git a/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h b/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h index f290b23e57e7..5b1f9b5ec499 100644 --- a/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h +++ b/trunk/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 *