diff -urN RC14-rc3-git4-mac8390/drivers/net/82596.c RC14-rc3-git4-82596-apricot/drivers/net/82596.c --- RC14-rc3-git4-mac8390/drivers/net/82596.c 2005-08-28 23:09:43.000000000 -0400 +++ RC14-rc3-git4-82596-apricot/drivers/net/82596.c 2005-10-04 15:13:48.000000000 -0400 @@ -614,7 +614,7 @@ 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;