diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-04-12 18:11:33 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-04-12 18:11:33 -0400 |
commit | 201e06279823c73242de987f192f43d2b30e5331 (patch) | |
tree | 409cbf8533ae3242a036c8c013bcd43d9c1410b3 /drivers/net/pcmcia | |
parent | 32ea89ecb25789b1b7db28146558587a42f3b372 (diff) | |
parent | c91e468a48a2afd2a2b0c2e29a35d6b8c51ea682 (diff) | |
download | talos-op-linux-201e06279823c73242de987f192f43d2b30e5331.tar.gz talos-op-linux-201e06279823c73242de987f192f43d2b30e5331.zip |
Merge branch 'upstream-fixes'
Diffstat (limited to 'drivers/net/pcmcia')
-rw-r--r-- | drivers/net/pcmcia/axnet_cs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c index 56233afcb2b3..448a09488529 100644 --- a/drivers/net/pcmcia/axnet_cs.c +++ b/drivers/net/pcmcia/axnet_cs.c @@ -1560,7 +1560,7 @@ static void ei_receive(struct net_device *dev) static void ei_rx_overrun(struct net_device *dev) { - axnet_dev_t *info = (axnet_dev_t *)dev; + axnet_dev_t *info = PRIV(dev); long e8390_base = dev->base_addr; unsigned char was_txing, must_resend = 0; struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev); |