Import 2.1.15

[davej-history.git] / include / linux / pci.h

diff --git a/include/linux/pci.hb/include/linux/pci.h
index 4118dfd..8839a61 100644 (file)
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -252,6+252,7 @@
 #define PCI_DEVICE_ID_TSENG_W32P_b     0x3205
 #define PCI_DEVICE_ID_TSENG_W32P_c     0x3206
 #define PCI_DEVICE_ID_TSENG_W32P_d     0x3207
+#define PCI_DEVICE_ID_TSENG_ET6000     0x3208
 
 #define PCI_VENDOR_ID_WEITEK           0x100e
 #define PCI_DEVICE_ID_WEITEK_P9000     0x9001
@@ -349,6+350,10 @@
 #define PCI_VENDOR_ID_OAK              0x104e
 #define PCI_DEVICE_ID_OAK_OTI107       0x0107
 
+/* Winbond have two vendor IDs! See 0x10ad as well */
+#define PCI_VENDOR_ID_WINBOND2         0x1050
+#define PCI_DEVICE_ID_WINBOND2_89C940  0x0940
+
 #define PCI_VENDOR_ID_PROMISE          0x105a
 #define PCI_DEVICE_ID_PROMISE_5300     0x5300
 
@@ -505,6+510,9 @@
 #define PCI_DEVICE_ID_SPECIALIX_XIO    0x4000
 #define PCI_DEVICE_ID_SPECIALIX_RIO    0x8000
 
+#define PCI_VENDOR_ID_COMPEX           0x11f6
+#define PCI_DEVICE_ID_COMPEX_RL2000    0x1401
+
 #define PCI_VENDOR_ID_RP               0x11fe
 #define PCI_DEVICE_ID_RP8OCTA          0x0001
 #define PCI_DEVICE_ID_RP8INTF          0x0002