From 278c6271db5f73a81ad963b64516e79c167f9be3 Mon Sep 17 00:00:00 2001 From: Matt Carlson Date: Wed, 20 Jan 2010 16:58:10 +0000 Subject: [PATCH] --- yaml --- r: 183707 b: refs/heads/master c: 334355aa590c4b58750015c2f5710cd5074f45dd h: refs/heads/master i: 183705: 5b814c9435c92e01152e105444bbbdda6790b95b 183703: 5cad756f309f615dfbf53449f32f778bdaf11b92 v: v3 --- [refs] | 2 +- trunk/drivers/net/tg3.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3b2722209754..2fa006a329ec 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cb4ed1fd8af963101a59c8c5fef97cbbf5f3fb88 +refs/heads/master: 334355aa590c4b58750015c2f5710cd5074f45dd diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c index 075d21a6b55a..78102023aa93 100644 --- a/trunk/drivers/net/tg3.c +++ b/trunk/drivers/net/tg3.c @@ -2021,7 +2021,9 @@ static void tg3_frob_aux_power(struct tg3 *tp) { struct tg3 *tp_peer = tp; - if ((tp->tg3_flags2 & TG3_FLG2_IS_NIC) == 0) + /* The GPIOs do something completely different on 57765. */ + if ((tp->tg3_flags2 & TG3_FLG2_IS_NIC) == 0 || + GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57765) return; if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704 ||