From 27ad3d9b9a7b9240e55964511135c1b8e6564e6b Mon Sep 17 00:00:00 2001
From: Bruce Allan <bruce.w.allan@intel.com>
Date: Wed, 8 Feb 2012 02:55:19 +0000
Subject: [PATCH] --- yaml --- r: 290119 b: refs/heads/master c:
 f1a3fe17f9ef0e51c63662b82e9915a693e8e375 h: refs/heads/master i:   290117:
 0891a9e7952f35ce3709fe8ebba4c853e2076ac8   290115:
 2db3e0d7a3ba3c96263f62feec2e277b1c31e5dd   290111:
 99ef40d11ab54d2babe9abe74f55b7254a0aab3d v: v3

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

diff --git a/[refs] b/[refs]
index e1f200c14301..ee890a27c7ab 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d7eb33840bee3c8de3f64f3861350bcfac3eaf82
+refs/heads/master: f1a3fe17f9ef0e51c63662b82e9915a693e8e375
diff --git a/trunk/drivers/net/ethernet/intel/e1000e/ich8lan.c b/trunk/drivers/net/ethernet/intel/e1000e/ich8lan.c
index 5a55a6134a3b..f5d7282afdf3 100644
--- a/trunk/drivers/net/ethernet/intel/e1000e/ich8lan.c
+++ b/trunk/drivers/net/ethernet/intel/e1000e/ich8lan.c
@@ -2161,8 +2161,6 @@ static s32 e1000_valid_nvm_bank_detect_ich8lan(struct e1000_hw *hw, u32 *bank)
 		e_dbg("ERROR: No valid NVM bank present\n");
 		return -E1000_ERR_NVM;
 	}
-
-	return 0;
 }
 
 /**