diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-28 23:57:20 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-28 23:57:20 -0500 |
| commit | 96789ac4b3943fec27fb6bf2713633b01a3903ad (patch) | |
| tree | 5fa9dce4561072e64e460c8d920851a63a3b0b98 /drivers/net/sky2.h | |
| parent | 77eebf346dfe87587ee8a54c76349a996e80c24f (diff) | |
| parent | 958ddb75b04b792c701b2b08acdb200d638abf4e (diff) | |
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/sky2.h')
| -rw-r--r-- | drivers/net/sky2.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/sky2.h b/drivers/net/sky2.h index 3edb98075e0a..dce955c76f3c 100644 --- a/drivers/net/sky2.h +++ b/drivers/net/sky2.h | |||
| @@ -1881,7 +1881,6 @@ struct sky2_hw { | |||
| 1881 | u32 intr_mask; | 1881 | u32 intr_mask; |
| 1882 | 1882 | ||
| 1883 | int pm_cap; | 1883 | int pm_cap; |
| 1884 | int msi; | ||
| 1885 | u8 chip_id; | 1884 | u8 chip_id; |
| 1886 | u8 chip_rev; | 1885 | u8 chip_rev; |
| 1887 | u8 copper; | 1886 | u8 copper; |