---

yaml --- r: 221603 b: refs/heads/master c: 1d9c05d h: refs/heads/master i: 221601: f67c589 221599: 0e128cd v: v3
git-mirror · Nov 1, 2010 · 60c0c85 · 60c0c85
1 parent a30681c
commit 60c0c85
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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));