aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2005-12-01 06:53:59 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2006-01-28 21:42:31 -0500
commit0018dfa48e171315ce7f0ea689e34b67af926e19 (patch)
tree02d3671f79172ea5ff00c173f41620202a7cde36
parent3c13958620f08c8082a2694e51dec32592438388 (diff)
[PATCH] wrong ifdefs in 82596.c
ifdefs around variable declaration would better match those around its uses... Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--drivers/net/82596.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/82596.c b/drivers/net/82596.c
index 13b745b39667..da0c878dcba8 100644
--- a/drivers/net/82596.c
+++ b/drivers/net/82596.c
@@ -614,7 +614,7 @@ static void rebuild_rx_bufs(struct net_device *dev)
614static int init_i596_mem(struct net_device *dev) 614static int init_i596_mem(struct net_device *dev)
615{ 615{
616 struct i596_private *lp = dev->priv; 616 struct i596_private *lp = dev->priv;
617#if !defined(ENABLE_MVME16x_NET) && !defined(ENABLE_BVME6000_NET) 617#if !defined(ENABLE_MVME16x_NET) && !defined(ENABLE_BVME6000_NET) || defined(ENABLE_APRICOT)
618 short ioaddr = dev->base_addr; 618 short ioaddr = dev->base_addr;
619#endif 619#endif
620 unsigned long flags; 620 unsigned long flags;