diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-04-17 15:35:18 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-04-17 15:35:18 +0100 |
| commit | 94171db1d2f23c22b6050d210b72db3bb2f0b81e (patch) | |
| tree | 2318d487807e9f7393fcd46ef0090a27b4ad7981 /drivers/net/sky2.c | |
| parent | d96fb997c6174f98a2a0a98200f99ac13b053bd6 (diff) | |
| parent | c19f7a9e1ac45b57375d51f033b02deca50f4d3f (diff) | |
| download | kernel_samsung_tuna-94171db1d2f23c22b6050d210b72db3bb2f0b81e.zip kernel_samsung_tuna-94171db1d2f23c22b6050d210b72db3bb2f0b81e.tar.gz kernel_samsung_tuna-94171db1d2f23c22b6050d210b72db3bb2f0b81e.tar.bz2 | |
Merge with git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/net/sky2.c')
| -rw-r--r-- | drivers/net/sky2.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index 68f9c20..67b0eab 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c @@ -99,8 +99,6 @@ MODULE_PARM_DESC(disable_msi, "Disable Message Signaled Interrupt (MSI)"); static const struct pci_device_id sky2_id_table[] = { { PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, 0x9000) }, { PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, 0x9E00) }, - { PCI_DEVICE(PCI_VENDOR_ID_DLINK, 0x4b00) }, - { PCI_DEVICE(PCI_VENDOR_ID_DLINK, 0x4b01) }, { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4340) }, { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4341) }, { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4342) }, @@ -579,8 +577,8 @@ static void sky2_mac_init(struct sky2_hw *hw, unsigned port) reg = gma_read16(hw, port, GM_PHY_ADDR); gma_write16(hw, port, GM_PHY_ADDR, reg | GM_PAR_MIB_CLR); - for (i = 0; i < GM_MIB_CNT_SIZE; i++) - gma_read16(hw, port, GM_MIB_CNT_BASE + 8 * i); + for (i = GM_MIB_CNT_BASE; i <= GM_MIB_CNT_END; i += 4) + gma_read16(hw, port, i); gma_write16(hw, port, GM_PHY_ADDR, reg); /* transmit control */ |