From 2ce6478e374fcadc01ab0e9ac190edde61caf6d4 Mon Sep 17 00:00:00 2001
From: Hannes Eder <hannes@hanneseder.net>
Date: Wed, 18 Feb 2009 19:36:04 -0800
Subject: [PATCH] --- yaml --- r: 134635 b: refs/heads/master c:
 9107584ecdda31981557034cccf5185afced3e0e h: refs/heads/master i:   134633:
 0c47c096a81d23953a7bbbf4f1619ce95829c129   134631:
 37c103a4f0e0aef0e40573cc5058e6a91c99b906 v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/net/igb/igb_main.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 4af21c3007d1..d0fe0777674d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ca1ada8861f22db37530594615b635d3dd1bde82
+refs/heads/master: 9107584ecdda31981557034cccf5185afced3e0e
diff --git a/trunk/drivers/net/igb/igb_main.c b/trunk/drivers/net/igb/igb_main.c
index 457f12e345ca..87eed88d9586 100644
--- a/trunk/drivers/net/igb/igb_main.c
+++ b/trunk/drivers/net/igb/igb_main.c
@@ -1971,7 +1971,7 @@ static void igb_configure_rx(struct igb_adapter *adapter)
 	struct e1000_hw *hw = &adapter->hw;
 	u32 rctl, rxcsum;
 	u32 rxdctl;
-	int i, j;
+	int i;
 
 	/* disable receives while setting up the descriptors */
 	rctl = rd32(E1000_RCTL);
@@ -1986,7 +1986,7 @@ static void igb_configure_rx(struct igb_adapter *adapter)
 	 * the Base and Length of the Rx Descriptor Ring */
 	for (i = 0; i < adapter->num_rx_queues; i++) {
 		struct igb_ring *ring = &adapter->rx_ring[i];
-		j = ring->reg_idx;
+		int j = ring->reg_idx;
 		rdba = ring->dma;
 		wr32(E1000_RDBAL(j),
 		     rdba & 0x00000000ffffffffULL);