From 4d70806f644bb2e1e995d74b2de4e14eb7db1350 Mon Sep 17 00:00:00 2001
From: Tushar Behera <tushar.behera@linaro.org>
Date: Fri, 14 Sep 2012 10:07:33 +0530
Subject: [PATCH] --- yaml --- r: 325281 b: refs/heads/master c:
 8e360ec82322358056786e651322085af3ef6960 h: refs/heads/master i:   325279:
 0abeff663da5a59d133f56780e9bd475b612210a v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/staging/bcm/nvm.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 6e37967e05fb..36108175e367 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d42bb0fbd93582adee0f404b1b82af809e9c0483
+refs/heads/master: 8e360ec82322358056786e651322085af3ef6960
diff --git a/trunk/drivers/staging/bcm/nvm.c b/trunk/drivers/staging/bcm/nvm.c
index ed592e09f868..b034eb5fa6b1 100644
--- a/trunk/drivers/staging/bcm/nvm.c
+++ b/trunk/drivers/staging/bcm/nvm.c
@@ -577,7 +577,7 @@ static int FlashSectorErase(struct bcm_mini_adapter *Adapter,
 			 * the sector erase cycle is 500 ms to 40000 msec. hence sleeping 10 ms
 			 * won't hamper performance in any case.
 			 */
-			udelay(10000);
+			mdelay(10);
 		} while ((uiStatus & 0x1) && (iRetries < 400));
 
 		if (uiStatus & 0x1) {