From 5f19990d18da21a1d137e13f4e35ee1a88a6270b Mon Sep 17 00:00:00 2001
From: Bruce Allan <bruce.w.allan@intel.com>
Date: Sat, 17 Dec 2011 08:32:57 +0000
Subject: [PATCH] --- yaml --- r: 289775 b: refs/heads/master c:
 c8243ee0488d9bc12995ca7ea02f651db820622e h: refs/heads/master i:   289773:
 948c3bbf8c6b059f5b050c193d5e3a19d52c22a0   289771:
 2394fb9cab48c96633a354ec053af58c7eeda86e   289767:
 bcf6a9fd94729e6b1de23a1d1e3eb8061c6eeaa8   289759:
 025198540186b79109aa3d759833fd3488638d14 v: v3

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

diff --git a/[refs] b/[refs]
index eb8f3b55c115..2f896551062e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 058e8edd11fb2c694c3c6c9fd8407439eb3eb954
+refs/heads/master: c8243ee0488d9bc12995ca7ea02f651db820622e
diff --git a/trunk/drivers/net/ethernet/intel/e1000e/ich8lan.c b/trunk/drivers/net/ethernet/intel/e1000e/ich8lan.c
index 53e5447cbbca..070a90f78aa9 100644
--- a/trunk/drivers/net/ethernet/intel/e1000e/ich8lan.c
+++ b/trunk/drivers/net/ethernet/intel/e1000e/ich8lan.c
@@ -2279,7 +2279,7 @@ static s32 e1000_flash_cycle_init_ich8lan(struct e1000_hw *hw)
 		 * cycle has a chance to end before giving up.
 		 */
 		for (i = 0; i < ICH_FLASH_READ_COMMAND_TIMEOUT; i++) {
-			hsfsts.regval = __er16flash(hw, ICH_FLASH_HSFSTS);
+			hsfsts.regval = er16flash(ICH_FLASH_HSFSTS);
 			if (hsfsts.hsf_status.flcinprog == 0) {
 				ret_val = 0;
 				break;