From 02eed46b0b4611a603ee9109dd13c94dc99f1717 Mon Sep 17 00:00:00 2001 From: Michael Chan Date: Thu, 14 Feb 2013 13:24:27 +0000 Subject: [PATCH] --- yaml --- r: 352472 b: refs/heads/master c: d240d210f5a9254d4df395d65f1ed3b2b45bc298 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/broadcom/tg3.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6a780508c797..c7d07ecd9ccb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d3f677afb8076d09d090ff0a5d1229c9dd9f136e +refs/heads/master: d240d210f5a9254d4df395d65f1ed3b2b45bc298 diff --git a/trunk/drivers/net/ethernet/broadcom/tg3.c b/trunk/drivers/net/ethernet/broadcom/tg3.c index 6e676a7279f8..3004d69596c3 100644 --- a/trunk/drivers/net/ethernet/broadcom/tg3.c +++ b/trunk/drivers/net/ethernet/broadcom/tg3.c @@ -14514,7 +14514,7 @@ static int tg3_phy_probe(struct tg3 *tp) (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5719 || GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5720 || GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5762 || - (tp->pdev->device == TG3PCI_DEVICE_TIGON3_5718 && + (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 && tp->pci_chip_rev_id != CHIPREV_ID_5717_A0) || (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57765 && tp->pci_chip_rev_id != CHIPREV_ID_57765_A0)))