diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-07 18:04:04 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-07 18:04:04 (GMT) |
commit | 50753817a3043e0621e99f329514c0c7003563b2 (patch) | |
tree | 8db82800dc6673c76d48eaca5177c3d5dc119683 /drivers/net/sky2.h | |
parent | eeb059e0a69369753b3e45426958f751f0b8fc89 (diff) | |
parent | 6967bd81d883ed325fd58840ee02a8da60458e6b (diff) | |
download | linux-fsl-qoriq-50753817a3043e0621e99f329514c0c7003563b2.tar.xz |
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 | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/net/sky2.h b/drivers/net/sky2.h index 9551892..fd12c28 100644 --- a/drivers/net/sky2.h +++ b/drivers/net/sky2.h @@ -1841,6 +1841,7 @@ struct sky2_hw { struct net_device *dev[2]; int pm_cap; + int msi; u8 chip_id; u8 chip_rev; u8 copper; @@ -1867,14 +1868,6 @@ static inline u8 sky2_read8(const struct sky2_hw *hw, unsigned reg) return readb(hw->regs + reg); } -/* This should probably go away, bus based tweeks suck */ -static inline int is_pciex(const struct sky2_hw *hw) -{ - u32 status; - pci_read_config_dword(hw->pdev, PCI_DEV_STATUS, &status); - return (status & PCI_OS_PCI_X) == 0; -} - static inline void sky2_write32(const struct sky2_hw *hw, unsigned reg, u32 val) { writel(val, hw->regs + reg); |