From d890881aeeed50259b5c4edd92f495dcd33e2336 Mon Sep 17 00:00:00 2001
From: Hannes Eder <hannes@hanneseder.net>
Date: Sat, 14 Feb 2009 11:11:55 +0000
Subject: [PATCH] --- yaml --- r: 134584 b: refs/heads/master c:
 1256f7394cc08c60d4502a2f08d7260f3fd97d56 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 7a2b3ef03194..505ce10c7c46 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1c10c49d83e2062b309cc88e8eb3abb05d397480
+refs/heads/master: 1256f7394cc08c60d4502a2f08d7260f3fd97d56
diff --git a/trunk/drivers/net/at1700.c b/trunk/drivers/net/at1700.c
index 72ea6e378f8d..ced70799b898 100644
--- a/trunk/drivers/net/at1700.c
+++ b/trunk/drivers/net/at1700.c
@@ -828,7 +828,6 @@ set_rx_mode(struct net_device *dev)
 	struct net_local *lp = netdev_priv(dev);
 	unsigned char mc_filter[8];		 /* Multicast hash filter */
 	unsigned long flags;
-	int i;
 
 	if (dev->flags & IFF_PROMISC) {
 		memset(mc_filter, 0xff, sizeof(mc_filter));
@@ -857,6 +856,7 @@ set_rx_mode(struct net_device *dev)
 
 	spin_lock_irqsave (&lp->lock, flags);
 	if (memcmp(mc_filter, lp->mc_filter, sizeof(mc_filter))) {
+		int i;
 		int saved_bank = inw(ioaddr + CONFIG_0);
 		/* Switch to bank 1 and set the multicast table. */
 		outw((saved_bank & ~0x0C00) | 0x0480, ioaddr + CONFIG_0);