From 60c0c85d23b37ffe19ce5fe52ec8f71e5b7e9b7d Mon Sep 17 00:00:00 2001
From: Yaniv Rosner <yaniv.rosner@broadcom.com>
Date: Mon, 1 Nov 2010 05:32:25 +0000
Subject: [PATCH] --- yaml --- r: 221603 b: refs/heads/master c:
 1d9c05d4d234493351cc39d8129fe5811147b2ff h: refs/heads/master i:   221601:
 f67c589fd2be1086af781c96eaa6928756bfee14   221599:
 0e128cdae3133ccc79ee6ffc72d6022f72289047 v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/net/bnx2x/bnx2x_link.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 560d286e0ff4..0242791ea361 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5ec1cea057495b8f10bab0c1396a9d8e46b7b0a8
+refs/heads/master: 1d9c05d4d234493351cc39d8129fe5811147b2ff
diff --git a/trunk/drivers/net/bnx2x/bnx2x_link.c b/trunk/drivers/net/bnx2x/bnx2x_link.c
index 2326774df843..89b33e27f614 100644
--- a/trunk/drivers/net/bnx2x/bnx2x_link.c
+++ b/trunk/drivers/net/bnx2x/bnx2x_link.c
@@ -610,7 +610,7 @@ static u8 bnx2x_bmac_enable(struct link_params *params,
 	/* reset and unreset the BigMac */
 	REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_2_CLEAR,
 		     (MISC_REGISTERS_RESET_REG_2_RST_BMAC0 << port));
-	udelay(10);
+	msleep(1);
 
 	REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_2_SET,
 		     (MISC_REGISTERS_RESET_REG_2_RST_BMAC0 << port));