Merge tag '9p-for-4.20' of git://github.com/martinetd/linux

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

diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index d157983b84cf9258fa43b639accc8ee3904a080c..69f0abe1ba1a00d9c65990d7612412c3509b301c 100644 (file)
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -117,6 +117,10 @@
 #define PCI_CLASS_SERIAL_USB_DEVICE    0x0c03fe
 #define PCI_CLASS_SERIAL_FIBER         0x0c04
 #define PCI_CLASS_SERIAL_SMBUS         0x0c05
+#define PCI_CLASS_SERIAL_IPMI          0x0c07
+#define PCI_CLASS_SERIAL_IPMI_SMIC     0x0c0700
+#define PCI_CLASS_SERIAL_IPMI_KCS      0x0c0701
+#define PCI_CLASS_SERIAL_IPMI_BT       0x0c0702
 
 #define PCI_BASE_CLASS_WIRELESS                        0x0d
 #define PCI_CLASS_WIRELESS_RF_CONTROLLER       0x0d10
@@ -2539,8 +2543,6 @@
 #define PCI_VENDOR_ID_HUAWEI           0x19e5
 
 #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_NFP4000        0x4000
 #define PCI_DEVICE_ID_NETRONOME_NFP5000        0x5000
 #define PCI_DEVICE_ID_NETRONOME_NFP6000        0x6000
@@ -2561,6 +2563,8 @@
 
 #define PCI_VENDOR_ID_AMAZON           0x1d0f
 
+#define PCI_VENDOR_ID_HYGON            0x1d94
+
 #define PCI_VENDOR_ID_TEKRAM           0x1de1
 #define PCI_DEVICE_ID_TEKRAM_DC290     0xdc29