From d140271bf2027eb1540441b50dba24979be1bd37 Mon Sep 17 00:00:00 2001
From: Matt Carlson <mcarlson@broadcom.com>
Date: Tue, 25 Jan 2011 15:58:56 +0000
Subject: [PATCH] --- yaml --- r: 236703 b: refs/heads/master c:
 d7f2ab20432441c7d4e41cd1745aafc17d712672 h: refs/heads/master i:   236701:
 8821e0ecc46c727dfcf87b28a524feb675deda5b   236699:
 5f00b57e5e3d4444f0da5d448a3fb1ccf091a67c   236695:
 f53d9207a133ad9298a910fe3a9d0d30a4d5355f   236687:
 b92cf871027062f9d26b384013dd41fb06cc4b54   236671:
 5655514a6102bb8308659f8be529a802bb2a4ff1 v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/net/tg3.c | 2 +-
 trunk/drivers/net/tg3.h | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 2ec260dd840a..bc8f1689361d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 21a00ab270f95d32e502d92f166dd75c518d3c5f
+refs/heads/master: d7f2ab20432441c7d4e41cd1745aafc17d712672
diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c
index f2b6257b9ef6..64bba302afd5 100644
--- a/trunk/drivers/net/tg3.c
+++ b/trunk/drivers/net/tg3.c
@@ -7829,7 +7829,7 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
 		       TG3_CPMU_DBTMR1_LNKIDLE_2047US);
 
 		tw32_f(TG3_CPMU_EEE_DBTMR2,
-		       TG3_CPMU_DBTMR1_APE_TX_2047US |
+		       TG3_CPMU_DBTMR2_APE_TX_2047US |
 		       TG3_CPMU_DBTMR2_TXIDXEQ_2047US);
 	}
 
diff --git a/trunk/drivers/net/tg3.h b/trunk/drivers/net/tg3.h
index 1dbe5eca6fed..716fc0008af1 100644
--- a/trunk/drivers/net/tg3.h
+++ b/trunk/drivers/net/tg3.h
@@ -1106,7 +1106,7 @@
 #define  TG3_CPMU_DBTMR1_PCIEXIT_2047US	 0x07ff0000
 #define  TG3_CPMU_DBTMR1_LNKIDLE_2047US	 0x000070ff
 #define TG3_CPMU_EEE_DBTMR2		0x000036b8
-#define  TG3_CPMU_DBTMR1_APE_TX_2047US	 0x07ff0000
+#define  TG3_CPMU_DBTMR2_APE_TX_2047US	 0x07ff0000
 #define  TG3_CPMU_DBTMR2_TXIDXEQ_2047US	 0x000070ff
 #define TG3_CPMU_EEE_LNKIDL_CTRL	0x000036bc
 #define  TG3_CPMU_EEE_LNKIDL_PCIE_NL0	 0x01000000