From 8aaaa917b9769fe819ba48300ca35867df6c3020 Mon Sep 17 00:00:00 2001 From: Bruce Allan Date: Thu, 23 Feb 2012 03:31:29 +0000 Subject: [PATCH] --- yaml --- r: 290521 b: refs/heads/master c: bb9c5ee15b560f944a8877f60e7d3d77ad542286 h: refs/heads/master i: 290519: 1d3a8024415f5647f9f5df24c15817560840b567 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/intel/e1000e/phy.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index db9630454e7f..fe75e38cb4a3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3d3a1676561cfb0dcef0cf5e146ddefbb16f5598 +refs/heads/master: bb9c5ee15b560f944a8877f60e7d3d77ad542286 diff --git a/trunk/drivers/net/ethernet/intel/e1000e/phy.c b/trunk/drivers/net/ethernet/intel/e1000e/phy.c index 6e768b11380e..35b45578c604 100644 --- a/trunk/drivers/net/ethernet/intel/e1000e/phy.c +++ b/trunk/drivers/net/ethernet/intel/e1000e/phy.c @@ -26,8 +26,6 @@ *******************************************************************************/ -#include - #include "e1000.h" static s32 e1000_get_phy_cfg_done(struct e1000_hw *hw); @@ -3153,7 +3151,7 @@ s32 e1000_link_stall_workaround_hv(struct e1000_hw *hw) BM_CS_STATUS_SPEED_1000)) return 0; - mdelay(200); + msleep(200); /* flush the packets in the fifo buffer */ ret_val = e1e_wphy(hw, HV_MUX_DATA_CTRL, HV_MUX_DATA_CTRL_GEN_TO_MAC |