diff options
author | Paul Mackerras <paulus@samba.org> | 2006-03-09 03:32:05 (GMT) |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-03-09 03:32:05 (GMT) |
commit | 516450179454de9e689e0a53ed8f34b896e8651c (patch) | |
tree | 78eae2f77de6cd39b18c7393fc5854456fc3fb1f /drivers/net/sky2.h | |
parent | 6749c5507388f3fc3719f57a54b540ee83f6661a (diff) | |
parent | 0d514f040ac6629311974889d5b96bcf21c6461a (diff) | |
download | linux-fsl-qoriq-516450179454de9e689e0a53ed8f34b896e8651c.tar.xz |
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 3edb980..dce955c 100644 --- a/drivers/net/sky2.h +++ b/drivers/net/sky2.h @@ -1881,7 +1881,6 @@ struct sky2_hw { u32 intr_mask; int pm_cap; - int msi; u8 chip_id; u8 chip_rev; u8 copper; |