diff options
| author | David S. Miller <davem@davemloft.net> | 2008-06-12 16:14:22 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-06-12 16:14:22 -0700 |
| commit | 030352a9c7715780b2c01033ae9afe56249bb7cc (patch) | |
| tree | cc23683773d0d63712f4e6ea6824383f1d696e05 /drivers/net/lib8390.c | |
| parent | e6e30add6bd8115af108de2a13ec82d997a55777 (diff) | |
| parent | 0c1aa20fb87b796d904f4d89ad12e5a0c483127b (diff) | |
Merge branch 'davem-next' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/lib8390.c')
| -rw-r--r-- | drivers/net/lib8390.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/lib8390.c b/drivers/net/lib8390.c index ed495275b577..00d59ab2f8ac 100644 --- a/drivers/net/lib8390.c +++ b/drivers/net/lib8390.c @@ -553,6 +553,8 @@ static void __ei_poll(struct net_device *dev) static void ei_tx_err(struct net_device *dev) { unsigned long e8390_base = dev->base_addr; + /* ei_local is used on some platforms via the EI_SHIFT macro */ + struct ei_device *ei_local __maybe_unused = netdev_priv(dev); unsigned char txsr = ei_inb_p(e8390_base+EN0_TSR); unsigned char tx_was_aborted = txsr & (ENTSR_ABT+ENTSR_FU); @@ -815,6 +817,8 @@ static void ei_rx_overrun(struct net_device *dev) { unsigned long e8390_base = dev->base_addr; unsigned char was_txing, must_resend = 0; + /* ei_local is used on some platforms via the EI_SHIFT macro */ + struct ei_device *ei_local __maybe_unused = netdev_priv(dev); /* * Record whether a Tx was in progress and then issue the |