linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / net / 82596.c

diff --git a/drivers/net/82596.c b/drivers/net/82596.c
index da0c878..13b745b 100644 (file)
--- 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) || defined(ENABLE_APRICOT)
+#if !defined(ENABLE_MVME16x_NET) && !defined(ENABLE_BVME6000_NET)
        short ioaddr = dev->base_addr;
 #endif
        unsigned long flags;