diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-03 00:05:35 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-03 00:05:35 -0400 |
| commit | 52c4d73a6cca0db2927b60935e57429f98eae7c1 (patch) | |
| tree | 2edd0d21e25ca0b044ba2e14425ccc21e07909f8 /drivers/net | |
| parent | ca9c5ffd9d12e136f72fa52840cda83485d586cd (diff) | |
| parent | 841adfca9c5fc0fec6b1f0b2e5eb7a3b239a7730 (diff) | |
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband:
IPoIB/cm: Partial error clean up unmaps wrong address
mlx4_core: Add new Mellanox device IDs
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/mlx4/main.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/mlx4/main.c b/drivers/net/mlx4/main.c index 41eafebf5823..c3da2a2f5431 100644 --- a/drivers/net/mlx4/main.c +++ b/drivers/net/mlx4/main.c | |||
| @@ -911,6 +911,8 @@ static struct pci_device_id mlx4_pci_table[] = { | |||
| 911 | { PCI_VDEVICE(MELLANOX, 0x6340) }, /* MT25408 "Hermon" SDR */ | 911 | { PCI_VDEVICE(MELLANOX, 0x6340) }, /* MT25408 "Hermon" SDR */ |
| 912 | { PCI_VDEVICE(MELLANOX, 0x634a) }, /* MT25408 "Hermon" DDR */ | 912 | { PCI_VDEVICE(MELLANOX, 0x634a) }, /* MT25408 "Hermon" DDR */ |
| 913 | { PCI_VDEVICE(MELLANOX, 0x6354) }, /* MT25408 "Hermon" QDR */ | 913 | { PCI_VDEVICE(MELLANOX, 0x6354) }, /* MT25408 "Hermon" QDR */ |
| 914 | { PCI_VDEVICE(MELLANOX, 0x6732) }, /* MT25408 "Hermon" DDR PCIe gen2 */ | ||
| 915 | { PCI_VDEVICE(MELLANOX, 0x673c) }, /* MT25408 "Hermon" QDR PCIe gen2 */ | ||
| 914 | { 0, } | 916 | { 0, } |
| 915 | }; | 917 | }; |
| 916 | 918 | ||