From 173b0a1823ace9418391c29e627c039bcc534653 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@linux-foundation.org>
Date: Mon, 5 Nov 2007 15:52:11 -0800
Subject: [PATCH] --- yaml --- r: 73433 b: refs/heads/master c:
 44388c7ead4b2bae9f82bc0862475640c50f357d h: refs/heads/master i:   73431:
 e97e395c6a4e4c0c42a815c797c9f72488f7dd79 v: v3

---
 [refs]                   |  2 +-
 trunk/drivers/net/sky2.c | 23 -----------------------
 2 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/[refs] b/[refs]
index 140ed0869853..cdc5997fd583 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: af043aa54fd45774e61979d1748616c2a67f0da8
+refs/heads/master: 44388c7ead4b2bae9f82bc0862475640c50f357d
diff --git a/trunk/drivers/net/sky2.c b/trunk/drivers/net/sky2.c
index eaab3d87dcf3..3c08db41cec4 100644
--- a/trunk/drivers/net/sky2.c
+++ b/trunk/drivers/net/sky2.c
@@ -1820,29 +1820,6 @@ static void sky2_link_up(struct sky2_port *sky2)
 	sky2_write8(hw, SK_REG(port, LNK_LED_REG),
 		    LINKLED_ON | LINKLED_BLINK_OFF | LINKLED_LINKSYNC_OFF);
 
-	if (hw->flags & SKY2_HW_NEWER_PHY) {
-		u16 pg = gm_phy_read(hw, port, PHY_MARV_EXT_ADR);
-		u16 led = PHY_M_LEDC_LOS_CTRL(1);	/* link active */
-
-		switch(sky2->speed) {
-		case SPEED_10:
-			led |= PHY_M_LEDC_INIT_CTRL(7);
-			break;
-
-		case SPEED_100:
-			led |= PHY_M_LEDC_STA1_CTRL(7);
-			break;
-
-		case SPEED_1000:
-			led |= PHY_M_LEDC_STA0_CTRL(7);
-			break;
-		}
-
-		gm_phy_write(hw, port, PHY_MARV_EXT_ADR, 3);
-		gm_phy_write(hw, port, PHY_MARV_PHY_CTRL, led);
-		gm_phy_write(hw, port, PHY_MARV_EXT_ADR, pg);
-	}
-
 	if (netif_msg_link(sky2))
 		printk(KERN_INFO PFX
 		       "%s: Link is up at %d Mbps, %s duplex, flow control %s\n",