From: Al Viro <viro@zeniv.linux.org.uk>
Date: Thu, 1 Dec 2005 11:53:59 +0000 (-0500)
Subject: [PATCH] wrong ifdefs in 82596.c
X-Git-Tag: v2.6.17-rc1~1186^2~57^2^2~1
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0018dfa48e171315ce7f0ea689e34b67af926e19;p=linux-2.6

[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>
---

diff --git a/drivers/net/82596.c b/drivers/net/82596.c
index 13b745b396..da0c878dcb 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;