Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

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

diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 15b49e655ce3649bd51d958b32fd08703034b0ba..45c3d62e616d858a2532b80d58a4574dcfc4a4f2 100644 (file)
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -75,6 +75,9 @@
 #define PCI_CLASS_COMMUNICATION_MODEM  0x0703
 #define PCI_CLASS_COMMUNICATION_OTHER  0x0780
 
+/* Interface for SERIAL/MODEM */
+#define PCI_SERIAL_16550_COMPATIBLE    0x02
+
 #define PCI_BASE_CLASS_SYSTEM          0x08
 #define PCI_CLASS_SYSTEM_PIC           0x0800
 #define PCI_CLASS_SYSTEM_PIC_IOAPIC    0x080010
@@ -3009,6 +3012,8 @@
 #define PCI_DEVICE_ID_INTEL_VMD_9A0B   0x9a0b
 #define PCI_DEVICE_ID_INTEL_S21152BB   0xb152
 
+#define PCI_VENDOR_ID_WANGXUN          0x8088
+
 #define PCI_VENDOR_ID_SCALEMP          0x8686
 #define PCI_DEVICE_ID_SCALEMP_VSMP_CTL 0x1010
 
@@ -3089,6 +3094,8 @@
 
 #define PCI_VENDOR_ID_3COM_2           0xa727
 
+#define PCI_VENDOR_ID_SOLIDRUN         0xd063
+
 #define PCI_VENDOR_ID_DIGIUM           0xd161
 #define PCI_DEVICE_ID_DIGIUM_HFC4S     0xb410