summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro2005-12-01 12:53:59 +0100
committerAl Viro2006-01-29 03:42:31 +0100
commit0018dfa48e171315ce7f0ea689e34b67af926e19 (patch)
tree02d3671f79172ea5ff00c173f41620202a7cde36
parent[PATCH] bogus include of linux/irq.h in 7990.c (diff)
downloadkernel-qcow2-linux-0018dfa48e171315ce7f0ea689e34b67af926e19.tar.gz
kernel-qcow2-linux-0018dfa48e171315ce7f0ea689e34b67af926e19.tar.xz
kernel-qcow2-linux-0018dfa48e171315ce7f0ea689e34b67af926e19.zip
[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)
static int init_i596_mem(struct net_device *dev)
{
struct i596_private *lp = dev->priv;
-#if !defined(ENABLE_MVME16x_NET) && !defined(ENABLE_BVME6000_NET)
+#if !defined(ENABLE_MVME16x_NET) && !defined(ENABLE_BVME6000_NET) || defined(ENABLE_APRICOT)
short ioaddr = dev->base_addr;
#endif
unsigned long flags;