diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-03-14 15:18:01 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-03-14 15:18:01 -0500 |
| commit | f33b5d783b4f56be5ace6a1c98fb5f76b2d2d07d (patch) | |
| tree | b027b5f3429d416b3da5b9195024007dab062a5e /drivers/net/sky2.h | |
| parent | e935d5da8e5d12fabe5b632736c50eae0427e8c8 (diff) | |
| parent | 67963132638e67ad3c5aa16765e6f3f2f3cdd85c (diff) | |
Merge ../linux-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; |