From fae094e54d4eb5e53a8ff9407a31e8d88caa7f8e Mon Sep 17 00:00:00 2001 From: Matt Carlson Date: Mon, 20 Apr 2009 06:58:01 +0000 Subject: [PATCH] --- yaml --- r: 149799 b: refs/heads/master c: 8d519ab2866c92f5d722085492a124f016f601aa h: refs/heads/master i: 149797: 4c546d5fd98028e51b0250ca118a0f5e81e8c259 149795: 52770eb6ace7718a23505305b689df96834ff7b0 149791: 60993685fed92aea8d4a60fdebe1fb8ac8f1ee36 v: v3 --- [refs] | 2 +- trunk/drivers/net/tg3.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4327906cbc4c..9297fa446908 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 33466d938f43ab65312466ba5472b9c6ee200cce +refs/heads/master: 8d519ab2866c92f5d722085492a124f016f601aa diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c index ed7a86df98cd..c5c3d2853144 100644 --- a/trunk/drivers/net/tg3.c +++ b/trunk/drivers/net/tg3.c @@ -1950,7 +1950,8 @@ static void tg3_frob_aux_power(struct tg3 *tp) GRC_LCLCTRL_GPIO_OUTPUT0 | GRC_LCLCTRL_GPIO_OUTPUT1), 100); - } else if (tp->pdev->device == PCI_DEVICE_ID_TIGON3_5761) { + } else if (tp->pdev->device == PCI_DEVICE_ID_TIGON3_5761 || + tp->pdev->device == TG3PCI_DEVICE_TIGON3_5761S) { /* The 5761 non-e device swaps GPIO 0 and GPIO 2. */ u32 grc_local_ctrl = GRC_LCLCTRL_GPIO_OE0 | GRC_LCLCTRL_GPIO_OE1 | @@ -12183,7 +12184,8 @@ static int __devinit tg3_get_invariants(struct tg3 *tp) GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57780) tp->grc_local_ctrl |= GRC_LCLCTRL_GPIO_UART_SEL; - if (tp->pdev->device == PCI_DEVICE_ID_TIGON3_5761) { + if (tp->pdev->device == PCI_DEVICE_ID_TIGON3_5761 || + tp->pdev->device == TG3PCI_DEVICE_TIGON3_5761S) { /* Turn off the debug UART. */ tp->grc_local_ctrl |= GRC_LCLCTRL_GPIO_UART_SEL; if (tp->tg3_flags2 & TG3_FLG2_IS_NIC)