diff options
| author | Linus Torvalds | 2009-10-29 17:16:23 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2009-10-29 17:16:23 +0100 |
| commit | ea38280c2a6e22997cf05bfea0d9391ddea1da24 (patch) | |
| tree | 9537bdf89da38177566c913833b1e917cf8c525a /drivers/net | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 (diff) | |
| parent | mlx4_core: Add a new supported 40 GigE device ID (diff) | |
| download | kernel-qcow2-linux-ea38280c2a6e22997cf05bfea0d9391ddea1da24.tar.gz kernel-qcow2-linux-ea38280c2a6e22997cf05bfea0d9391ddea1da24.tar.xz kernel-qcow2-linux-ea38280c2a6e22997cf05bfea0d9391ddea1da24.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
mlx4_core: Add a new supported 40 GigE device ID
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/mlx4/main.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/mlx4/main.c b/drivers/net/mlx4/main.c index 5dd7225b178e..291a505fd4fc 100644 --- a/drivers/net/mlx4/main.c +++ b/drivers/net/mlx4/main.c @@ -1282,6 +1282,7 @@ static struct pci_device_id mlx4_pci_table[] = { { PCI_VDEVICE(MELLANOX, 0x6372) }, /* MT25458 ConnectX EN 10GBASE-T 10GigE */ { PCI_VDEVICE(MELLANOX, 0x675a) }, /* MT25458 ConnectX EN 10GBASE-T+Gen2 10GigE */ { PCI_VDEVICE(MELLANOX, 0x6764) }, /* MT26468 ConnectX EN 10GigE PCIe gen2*/ + { PCI_VDEVICE(MELLANOX, 0x6746) }, /* MT26438 ConnectX EN 40GigE PCIe gen2 5GT/s */ { PCI_VDEVICE(MELLANOX, 0x676e) }, /* MT26478 ConnectX2 40GigE PCIe gen2 */ { 0, } }; |