diff --git a/[refs] b/[refs]
index 35432401a39a..903464469a16 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a76b044af147135b5fb7570aba35d4908f143cc9
+refs/heads/master: cb958186ed543d1a4f074ceb1c783fe8b0908437
diff --git a/trunk/drivers/net/3c515.c b/trunk/drivers/net/3c515.c
index 4532b17e40ea..aedfddf20cb3 100644
--- a/trunk/drivers/net/3c515.c
+++ b/trunk/drivers/net/3c515.c
@@ -1003,7 +1003,8 @@ static int corkscrew_start_xmit(struct sk_buff *skb,
 		/* Calculate the next Tx descriptor entry. */
 		int entry = vp->cur_tx % TX_RING_SIZE;
 		struct boom_tx_desc *prev_entry;
-		unsigned long flags, i;
+		unsigned long flags;
+		int i;
 
 		if (vp->tx_full)	/* No room to transmit with */
 			return 1;