diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-12 00:26:34 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-12 00:26:34 -0700 |
commit | cbd09dbbb62096c1da627eca865f988d2ed0a84e (patch) | |
tree | 9601e631cee6651c638cc7b4d2d9b7cf20b6b485 /drivers/net/sky2.h | |
parent | missed bio_endio() in axonram (diff) | |
parent | [ZLIB]: Fix external builds of zlib_inflate code. (diff) | |
download | linux-dev-cbd09dbbb62096c1da627eca865f988d2ed0a84e.tar.xz linux-dev-cbd09dbbb62096c1da627eca865f988d2ed0a84e.zip |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[ZLIB]: Fix external builds of zlib_inflate code.
[TG3]: Fix APE induced regression
[SKY2]: version 1.19
[SKY2]: use netdevice stats struct
[SKY2]: fiber advertise bits initialization (trivial)
[SKY2]: fix power settings on Yukon XL
[SKY2]: ethtool register reserved area blackout
Diffstat (limited to 'drivers/net/sky2.h')
-rw-r--r-- | drivers/net/sky2.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/sky2.h b/drivers/net/sky2.h index f4a3c2f403e5..49ee264064ab 100644 --- a/drivers/net/sky2.h +++ b/drivers/net/sky2.h @@ -2031,8 +2031,6 @@ struct sky2_port { #ifdef CONFIG_SKY2_DEBUG struct dentry *debugfs; #endif - struct net_device_stats net_stats; - }; struct sky2_hw { |