diff options
Diffstat (limited to 'drivers/net/sky2.h')
-rw-r--r-- | drivers/net/sky2.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/net/sky2.h b/drivers/net/sky2.h index 95518921001c..fd12c289a238 100644 --- a/drivers/net/sky2.h +++ b/drivers/net/sky2.h | |||
@@ -1841,6 +1841,7 @@ struct sky2_hw { | |||
1841 | struct net_device *dev[2]; | 1841 | struct net_device *dev[2]; |
1842 | 1842 | ||
1843 | int pm_cap; | 1843 | int pm_cap; |
1844 | int msi; | ||
1844 | u8 chip_id; | 1845 | u8 chip_id; |
1845 | u8 chip_rev; | 1846 | u8 chip_rev; |
1846 | u8 copper; | 1847 | u8 copper; |
@@ -1867,14 +1868,6 @@ static inline u8 sky2_read8(const struct sky2_hw *hw, unsigned reg) | |||
1867 | return readb(hw->regs + reg); | 1868 | return readb(hw->regs + reg); |
1868 | } | 1869 | } |
1869 | 1870 | ||
1870 | /* This should probably go away, bus based tweeks suck */ | ||
1871 | static inline int is_pciex(const struct sky2_hw *hw) | ||
1872 | { | ||
1873 | u32 status; | ||
1874 | pci_read_config_dword(hw->pdev, PCI_DEV_STATUS, &status); | ||
1875 | return (status & PCI_OS_PCI_X) == 0; | ||
1876 | } | ||
1877 | |||
1878 | static inline void sky2_write32(const struct sky2_hw *hw, unsigned reg, u32 val) | 1871 | static inline void sky2_write32(const struct sky2_hw *hw, unsigned reg, u32 val) |
1879 | { | 1872 | { |
1880 | writel(val, hw->regs + reg); | 1873 | writel(val, hw->regs + reg); |