diff options
| author | Richard Knutsson <ricknu-0@student.ltu.se> | 2008-02-05 07:27:39 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-05 18:44:08 +0100 |
| commit | 1569d9e89a77d51750497dc23d303e27d0d9494d (patch) | |
| tree | 1d5dee97169b4c2976a255ff3eeb907fd062ab70 /drivers | |
| parent | pcmcia: include bad CIS filename in error message (diff) | |
| download | linux-1569d9e89a77d51750497dc23d303e27d0d9494d.tar.xz linux-1569d9e89a77d51750497dc23d303e27d0d9494d.zip | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/pcmcia/3c574_cs.c | 2 |
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) mdio_write(ioaddr, lp->phys, 4, lp->advertising); if (!auto_polarity) { /* works for TDK 78Q2120 series MII's */ - int i = mdio_read(ioaddr, lp->phys, 16) | 0x20; + i = mdio_read(ioaddr, lp->phys, 16) | 0x20; mdio_write(ioaddr, lp->phys, 16, i); } |