From 7df0f6ed09575449847de814c8a1064155574bd4 Mon Sep 17 00:00:00 2001
From: Bruce Allan <bruce.w.allan@intel.com>
Date: Fri, 20 Nov 2009 23:28:17 +0000
Subject: [PATCH] --- yaml --- r: 171796 b: refs/heads/master c:
 9b724613c91ce60806ffc689f5032ff258644c6c h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/net/e1000e/ich8lan.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 272e21aa5119..4fc61cdb67af 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: de39b7523348640f4c0e662e430c67594d858a08
+refs/heads/master: 9b724613c91ce60806ffc689f5032ff258644c6c
diff --git a/trunk/drivers/net/e1000e/ich8lan.c b/trunk/drivers/net/e1000e/ich8lan.c
index fe6dc3de9ac7..f991b14a98d3 100644
--- a/trunk/drivers/net/e1000e/ich8lan.c
+++ b/trunk/drivers/net/e1000e/ich8lan.c
@@ -630,8 +630,6 @@ static s32 e1000_acquire_swflag_ich8lan(struct e1000_hw *hw)
 	u32 extcnf_ctrl, timeout = PHY_CFG_TIMEOUT;
 	s32 ret_val = 0;
 
-	might_sleep();
-
 	mutex_lock(&swflag_mutex);
 
 	while (timeout) {