From 071916e1b1cf56a3020654dcc79b8fe6706159c6 Mon Sep 17 00:00:00 2001
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Thu, 2 Mar 2006 18:17:30 -0800
Subject: [PATCH] --- yaml --- r: 21245 b: refs/heads/master c:
 5b66ba0db8d04d99926445bc7d9f920bb5d744ed h: refs/heads/master i:   21243:
 5b6b3e87ed0a5c40c6c430d5b4c5b0c194aff9b2 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/net/e1000/e1000_hw.c | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index aa564c2a51d6..31674b9bded3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0989aa431636ffb347314f0e2f367fdd16d7a57f
+refs/heads/master: 5b66ba0db8d04d99926445bc7d9f920bb5d744ed
diff --git a/trunk/drivers/net/e1000/e1000_hw.c b/trunk/drivers/net/e1000/e1000_hw.c
index beeec0fbbeac..0af68bab974b 100644
--- a/trunk/drivers/net/e1000/e1000_hw.c
+++ b/trunk/drivers/net/e1000/e1000_hw.c
@@ -6746,12 +6746,6 @@ e1000_get_phy_cfg_done(struct e1000_hw *hw)
         break;
     }
 
-    /* PHY configuration from NVM just starts after EECD_AUTO_RD sets to high.
-     * Need to wait for PHY configuration completion before accessing NVM
-     * and PHY. */
-    if (hw->mac_type == e1000_82573)
-        msec_delay(25);
-
     return E1000_SUCCESS;
 }