---

yaml --- r: 290119 b: refs/heads/master c: f1a3fe1 h: refs/heads/master i: 290117: 0891a9e 290115: 2db3e0d 290111: 99ef40d v: v3
git-mirror · Feb 13, 2012 · 27ad3d9 · 27ad3d9
1 parent 937156a
commit 27ad3d9
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git 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
@@ -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;
 }
 
 /**
-Original file line number
+Diff line change
@@ Expand Up @@
     		e_dbg("ERROR: No valid NVM bank present\n");
     		return -E1000_ERR_NVM;
     	}
-    	return 0;
     }
     /**
@@ Expand Down @@