aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Knutsson <ricknu-0@student.ltu.se>2008-02-05 01:27:39 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-05 12:44:08 -0500
commit1569d9e89a77d51750497dc23d303e27d0d9494d (patch)
tree1d5dee97169b4c2976a255ff3eeb907fd062ab70
parent52debb06238b8076ec2667359668d4c5e38e8807 (diff)
pcmcia/3c574_cs: fix 'shadow variable' warning
Fixing: CHECK drivers/net/pcmcia/3c574_cs.c drivers/net/pcmcia/3c574_cs.c:695:7: warning: symbol 'i' shadows an earlier one drivers/net/pcmcia/3c574_cs.c:636:6: originally declared here Signed-off-by: Richard Knutson <ricknu-0@student.ltu.se> Acked-by: Alan Cox <alan@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/net/pcmcia/3c574_cs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/pcmcia/3c574_cs.c b/drivers/net/pcmcia/3c574_cs.c
index dafbbdbc4bf7..3b78a3819bb3 100644
--- a/drivers/net/pcmcia/3c574_cs.c
+++ b/drivers/net/pcmcia/3c574_cs.c
@@ -696,7 +696,7 @@ static void tc574_reset(struct net_device *dev)
696 mdio_write(ioaddr, lp->phys, 4, lp->advertising); 696 mdio_write(ioaddr, lp->phys, 4, lp->advertising);
697 if (!auto_polarity) { 697 if (!auto_polarity) {
698 /* works for TDK 78Q2120 series MII's */ 698 /* works for TDK 78Q2120 series MII's */
699 int i = mdio_read(ioaddr, lp->phys, 16) | 0x20; 699 i = mdio_read(ioaddr, lp->phys, 16) | 0x20;
700 mdio_write(ioaddr, lp->phys, 16, i); 700 mdio_write(ioaddr, lp->phys, 16, i);
701 } 701 }
702 702