From: Matt Carlson Date: Tue, 25 Jan 2011 15:58:56 +0000 (+0000) Subject: tg3: Fix eee preprocessor naming X-Git-Tag: MMI-PSA29.97-13-9~20520^2~461 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d7f2ab20432441c7d4e41cd1745aafc17d712672;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git tg3: Fix eee preprocessor naming This patch fixes a preprocessor naming bug for one of the EEE registers. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Signed-off-by: David S. Miller --- diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index f2b6257b9ef6..64bba302afd5 100644 --- a/drivers/net/tg3.c +++ b/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/drivers/net/tg3.h b/drivers/net/tg3.h index 1dbe5eca6fed..716fc0008af1 100644 --- a/drivers/net/tg3.h +++ b/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