diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 14:15:02 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 14:15:02 -0500 |
| commit | 2746b8623abce815aaae7afc946b1b39f8436f5a (patch) | |
| tree | 9e14ce2a3710da5c079c1a96efa5e7c8674cd382 /drivers/net/82596.c | |
| parent | 0bdd340c092b0936f78a54bdbd3927463ed4fca3 (diff) | |
| parent | 450d86dff3fc4780fd5c2d1654402ab7ffec9c38 (diff) | |
| download | linux-rt-2746b8623abce815aaae7afc946b1b39f8436f5a.tar.gz | |
Merge branch 'net.b0' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/bird
Diffstat (limited to 'drivers/net/82596.c')
| -rw-r--r-- | drivers/net/82596.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/82596.c b/drivers/net/82596.c index 13b745b39667..da0c878dcba8 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; |