From: "Jason S. McMullan" <[email protected]> 3.12-stable review patch. If anyone has any objections, please let me know.
=============== commit a755e169031dac9ebaed03302c4921687c271d62 upstream. Device IDs for the Netronome NFP3200, NFP3240, NFP6000, and NFP6000 SR-IOV devices. Signed-off-by: Jason S. McMullan <[email protected]> [simon: edited changelog] Signed-off-by: Simon Horman <[email protected]> Signed-off-by: Bjorn Helgaas <[email protected]> Signed-off-by: Jiri Slaby <[email protected]> --- include/linux/pci_ids.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 5695d8a0aedb..1f6af8691649 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -2475,6 +2475,12 @@ #define PCI_DEVICE_ID_KORENIX_JETCARDF2 0x1700 #define PCI_DEVICE_ID_KORENIX_JETCARDF3 0x17ff +#define PCI_VENDOR_ID_NETRONOME 0x19ee +#define PCI_DEVICE_ID_NETRONOME_NFP3200 0x3200 +#define PCI_DEVICE_ID_NETRONOME_NFP3240 0x3240 +#define PCI_DEVICE_ID_NETRONOME_NFP6000 0x6000 +#define PCI_DEVICE_ID_NETRONOME_NFP6000_VF 0x6003 + #define PCI_VENDOR_ID_QMI 0x1a32 #define PCI_VENDOR_ID_AZWAVE 0x1a3b -- 2.10.0
