diff mbox

[net-next,v1] net: bnx2x: avoid macro redefinition

Message ID 1421005357-25708-1-git-send-email-ddecotig@gmail.com
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

david decotigny Jan. 11, 2015, 7:42 p.m. UTC 
From: David Decotigny <decot@googlers.com>

Signed-off-by: David Decotigny <decot@googlers.com>
---
 drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 4 ----
 1 file changed, 4 deletions(-)

Comments

David Miller Jan. 12, 2015, 10:02 p.m. UTC | #1 
From: David Decotigny <ddecotig@gmail.com>
Date: Sun, 11 Jan 2015 11:42:37 -0800

> From: David Decotigny <decot@googlers.com>
> 
> Signed-off-by: David Decotigny <decot@googlers.com>

Applied.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
index 792ba72..756053c 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;