---

yaml --- r: 21208 b: refs/heads/master c: 0018dfa h: refs/heads/master v: v3
git-mirror · Jan 29, 2006 · d395ed9 · d395ed9
1 parent 41a83ab
commit d395ed9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;