From d395ed9695a88f7800fccdc18ccf49c1fd2e1ae2 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Thu, 1 Dec 2005 06:53:59 -0500
Subject: [PATCH] --- yaml --- r: 21208 b: refs/heads/master c:
 0018dfa48e171315ce7f0ea689e34b67af926e19 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/net/82596.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 64fbad79e7fe..20e308f980ff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3c13958620f08c8082a2694e51dec32592438388
+refs/heads/master: 0018dfa48e171315ce7f0ea689e34b67af926e19
diff --git a/trunk/drivers/net/82596.c b/trunk/drivers/net/82596.c
index 13b745b39667..da0c878dcba8 100644
--- a/trunk/drivers/net/82596.c
+++ b/trunk/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;