Merge tag 'pull-18-rc1-work.mount' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-block.git] / include / linux / pci_ids.h

diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index aad54c66640774643e68910ed23f882a55655592..0178823ce8c20a9cf896f91be03db25af1967a5e 100644 (file)
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -60,6 +60,8 @@
 #define PCI_CLASS_BRIDGE_EISA          0x0602
 #define PCI_CLASS_BRIDGE_MC            0x0603
 #define PCI_CLASS_BRIDGE_PCI           0x0604
+#define PCI_CLASS_BRIDGE_PCI_NORMAL            0x060400
+#define PCI_CLASS_BRIDGE_PCI_SUBTRACTIVE       0x060401
 #define PCI_CLASS_BRIDGE_PCMCIA                0x0605
 #define PCI_CLASS_BRIDGE_NUBUS         0x0606
 #define PCI_CLASS_BRIDGE_CARDBUS       0x0607
@@ -2529,11 +2531,16 @@
 #define PCI_DEVICE_ID_KORENIX_JETCARDF3        0x17ff
 
 #define PCI_VENDOR_ID_HUAWEI           0x19e5
+#define PCI_DEVICE_ID_HUAWEI_ZIP_VF    0xa251
+#define PCI_DEVICE_ID_HUAWEI_SEC_VF    0xa256
+#define PCI_DEVICE_ID_HUAWEI_HPRE_VF   0xa259
 
 #define PCI_VENDOR_ID_NETRONOME                0x19ee
+#define PCI_DEVICE_ID_NETRONOME_NFP3800        0x3800
 #define PCI_DEVICE_ID_NETRONOME_NFP4000        0x4000
 #define PCI_DEVICE_ID_NETRONOME_NFP5000        0x5000
 #define PCI_DEVICE_ID_NETRONOME_NFP6000        0x6000
+#define PCI_DEVICE_ID_NETRONOME_NFP3800_VF     0x3803
 #define PCI_DEVICE_ID_NETRONOME_NFP6000_VF     0x6003
 
 #define PCI_VENDOR_ID_QMI              0x1a32
@@ -2561,6 +2568,8 @@
 
 #define PCI_VENDOR_ID_HYGON            0x1d94
 
+#define PCI_VENDOR_ID_FUNGIBLE         0x1dad
+
 #define PCI_VENDOR_ID_HXT              0x1dbf
 
 #define PCI_VENDOR_ID_TEKRAM           0x1de1