From 4879b6920075e1843f0686c0ac6d5ab674f3fc06 Mon Sep 17 00:00:00 2001
From: Bruce Allan <bruce.w.allan@intel.com>
Date: Wed, 24 Nov 2010 06:01:41 +0000
Subject: [PATCH] --- yaml --- r: 225012 b: refs/heads/master c:
 ce54afd16d874ac07378a8bb55d26f7f5b613c0e h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 0821cfa82752..d96d877a2626 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d9c76f99c2a79feb413e3e751362d59c0f5323f6
+refs/heads/master: ce54afd16d874ac07378a8bb55d26f7f5b613c0e
diff --git a/trunk/drivers/net/e1000e/ich8lan.c b/trunk/drivers/net/e1000e/ich8lan.c
index e3374d9a2472..d7fc930d1aa5 100644
--- a/trunk/drivers/net/e1000e/ich8lan.c
+++ b/trunk/drivers/net/e1000e/ich8lan.c
@@ -3591,7 +3591,7 @@ void e1000e_disable_gig_wol_ich8lan(struct e1000_hw *hw)
 	ew32(PHY_CTRL, phy_ctrl);
 
 	if (hw->mac.type >= e1000_pchlan) {
-		e1000_oem_bits_config_ich8lan(hw, true);
+		e1000_oem_bits_config_ich8lan(hw, false);
 		ret_val = hw->phy.ops.acquire(hw);
 		if (ret_val)
 			return;