diff options
| author | David S. Miller <davem@davemloft.net> | 2008-06-20 01:00:04 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-06-20 01:00:04 +0200 |
| commit | 0344f1c66b544609e867bd24aa7bfa789dfa9830 (patch) | |
| tree | 7f76abc095a90f7ad475417495d3d4f577080ae1 /drivers/net/sky2.c | |
| parent | netdevice: Fix promiscuity and allmulti overflow (diff) | |
| parent | mac80211: detect driver tx bugs (diff) | |
| download | linux-0344f1c66b544609e867bd24aa7bfa789dfa9830.tar.xz linux-0344f1c66b544609e867bd24aa7bfa789dfa9830.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/mac80211/tx.c
Diffstat (limited to 'drivers/net/sky2.c')
| -rw-r--r-- | drivers/net/sky2.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index 64b7effe49dd..711e4a8948e0 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c @@ -118,6 +118,7 @@ static DEFINE_PCI_DEVICE_TABLE(sky2_id_table) = { { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4352) }, /* 88E8038 */ { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4353) }, /* 88E8039 */ { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4354) }, /* 88E8040 */ + { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4355) }, /* 88E8040T */ { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4356) }, /* 88EC033 */ { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4357) }, /* 88E8042 */ { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x435A) }, /* 88E8048 */ |