Merge branch 'x86/entry' into ras/core

[sfrench/cifs-2.6.git] / include / linux / pci_ids.h

diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 3155f5ada02ebc754c620338e08e3bfbd9e481a1..0ad57693f3926e8804759017f63f52e33e937fc1 100644 (file)
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1833,6 +1833,12 @@
 #define PCI_VENDOR_ID_NVIDIA_SGS       0x12d2
 #define PCI_DEVICE_ID_NVIDIA_SGS_RIVA128 0x0018
 
+#define PCI_VENDOR_ID_PERICOM                  0x12D8
+#define PCI_DEVICE_ID_PERICOM_PI7C9X7951       0x7951
+#define PCI_DEVICE_ID_PERICOM_PI7C9X7952       0x7952
+#define PCI_DEVICE_ID_PERICOM_PI7C9X7954       0x7954
+#define PCI_DEVICE_ID_PERICOM_PI7C9X7958       0x7958
+
 #define PCI_SUBVENDOR_ID_CHASE_PCIFAST         0x12E0
 #define PCI_SUBDEVICE_ID_CHASE_PCIFAST4                0x0031
 #define PCI_SUBDEVICE_ID_CHASE_PCIFAST8                0x0021