From: David S. Miller <davem@davemloft.net>
Date: Wed, 17 Dec 2008 07:45:02 +0000 (-0800)
Subject: bnx2: Don't redefine FLOW_CTRL_{RX,TX}.
X-Git-Tag: v2.6.29-rc1~581^2~146
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=f6d52432a4bc6da5de2a0bbb350f735db3206aa5;p=linux-2.6-omap-h63xx.git

bnx2: Don't redefine FLOW_CTRL_{RX,TX}.

They are provided generically by linux/mii.h now.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/bnx2.h b/drivers/net/bnx2.h
index 88f962bff2d..900641ac63e 100644
--- a/drivers/net/bnx2.h
+++ b/drivers/net/bnx2.h
@@ -6848,9 +6848,6 @@ struct bnx2 {
 	u8			flow_ctrl;	/* actual flow ctrl settings */
 						/* may be different from     */
 						/* req_flow_ctrl if autoneg  */
-#define FLOW_CTRL_TX		1
-#define FLOW_CTRL_RX		2
-
 	u32			advertising;
 
 	u8			req_flow_ctrl;	/* flow ctrl advertisement */