diff options
author | David S. Miller <davem@davemloft.net> | 2008-05-13 10:19:43 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-05-13 10:19:43 +0200 |
commit | 99dd1a2b8347ac2ae802300b7862f6f7bcf17139 (patch) | |
tree | 4f583715a29ac95723b85532f47c3c568a544f1d /drivers/net/tokenring/3c359.h | |
parent | tipc: Fix race condition when creating socket or native port (diff) | |
parent | [netdrvr] Trim trailing whitespace for several drivers (diff) | |
download | linux-99dd1a2b8347ac2ae802300b7862f6f7bcf17139.tar.xz linux-99dd1a2b8347ac2ae802300b7862f6f7bcf17139.zip |
Merge branch 'upstream-next' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/tokenring/3c359.h')
-rw-r--r-- | drivers/net/tokenring/3c359.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/tokenring/3c359.h b/drivers/net/tokenring/3c359.h index b880cba0f6fd..0f8b4ec8695a 100644 --- a/drivers/net/tokenring/3c359.h +++ b/drivers/net/tokenring/3c359.h @@ -273,8 +273,6 @@ struct xl_private { struct wait_queue *srb_wait; volatile int asb_queued; - struct net_device_stats xl_stats ; - u16 mac_buffer ; u16 xl_lan_status ; u8 xl_ring_speed ; |