---

yaml --- r: 289775 b: refs/heads/master c: c8243ee h: refs/heads/master i: 289773: 948c3bb 289771: 2394fb9 289767: bcf6a9f 289759: 0251985 v: v3
git-mirror · Jan 27, 2012 · 5f19990 · 5f19990
1 parent a077621
commit 5f19990
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: 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
@@ -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;