From e6e398d77a089a9f28037f74debd74d8074e3add Mon Sep 17 00:00:00 2001
From: Benjamin Li <benli@broadcom.com>
Date: Fri, 18 Jul 2008 17:57:26 -0700
Subject: [PATCH] --- yaml --- r: 103635 b: refs/heads/master c:
 8a31329eae0949a8a73b64fcead84bb44a350591 h: refs/heads/master i:   103633:
 2b9e97fa02ca0be556243b748424763faafb38b2   103631:
 7468246b32697775af466e78f9cc694c2f5136eb v: v3

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

diff --git a/[refs] b/[refs]
index e5283a5c4d5a..e096c53c0588 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 706bf24038ba88ec77503b4829b16da712a32f04
+refs/heads/master: 8a31329eae0949a8a73b64fcead84bb44a350591
diff --git a/trunk/drivers/net/bnx2.c b/trunk/drivers/net/bnx2.c
index dc6f26190f36..c06549997ada 100644
--- a/trunk/drivers/net/bnx2.c
+++ b/trunk/drivers/net/bnx2.c
@@ -294,7 +294,6 @@ bnx2_ctx_wr(struct bnx2 *bp, u32 cid_addr, u32 offset, u32 val)
 		REG_WR(bp, BNX2_CTX_CTX_CTRL,
 		       offset | BNX2_CTX_CTX_CTRL_WRITE_REQ);
 		for (i = 0; i < 5; i++) {
-			u32 val;
 			val = REG_RD(bp, BNX2_CTX_CTX_CTRL);
 			if ((val & BNX2_CTX_CTX_CTRL_WRITE_REQ) == 0)
 				break;
@@ -7458,7 +7457,6 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)
 	reg &= BNX2_CONDITION_MFW_RUN_MASK;
 	if (reg != BNX2_CONDITION_MFW_RUN_UNKNOWN &&
 	    reg != BNX2_CONDITION_MFW_RUN_NONE) {
-		int i;
 		u32 addr = bnx2_shmem_rd(bp, BNX2_MFW_VER_PTR);
 
 		bp->fw_version[j++] = ' ';