diff options
| author | David Decotigny <decot@googlers.com> | 2015-01-11 11:42:37 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-01-12 16:51:15 -0500 |
| commit | b1e8bc617d30fc9360a58889f21a0d0ce982cf04 (patch) | |
| tree | db2adad090c0cd44416f4f7e9eed0eec924848f1 /drivers/net | |
| parent | ddcde70cbf2f837a083012965eaec6d213b87c48 (diff) | |
| download | linux-b1e8bc617d30fc9360a58889f21a0d0ce982cf04.tar.gz linux-b1e8bc617d30fc9360a58889f21a0d0ce982cf04.tar.bz2 linux-b1e8bc617d30fc9360a58889f21a0d0ce982cf04.zip | |
net: bnx2x: avoid macro redefinition
Signed-off-by: David Decotigny <decot@googlers.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h index 792ba72fb5c8..756053c028be 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h @@ -1138,12 +1138,8 @@ struct bnx2x_port { u32 link_config[LINK_CONFIG_SIZE]; u32 supported[LINK_CONFIG_SIZE]; -/* link settings - missing defines */ -#define SUPPORTED_2500baseX_Full (1 << 15) u32 advertising[LINK_CONFIG_SIZE]; -/* link settings - missing defines */ -#define ADVERTISED_2500baseX_Full (1 << 15) u32 phy_addr; |