This commit was manufactured by cvs2svn to create tag

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

diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 47f6eea..01fe9c3 100644 (file)
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -342,22 +342,9 @@
 #define PCI_DEVICE_ID_ATI_RS300_133    0x5831
 #define PCI_DEVICE_ID_ATI_RS300_166    0x5832
 #define PCI_DEVICE_ID_ATI_RS300_200    0x5833
-#define PCI_DEVICE_ID_ATI_RS350_100     0x7830
-#define PCI_DEVICE_ID_ATI_RS350_133     0x7831
-#define PCI_DEVICE_ID_ATI_RS350_166     0x7832
-#define PCI_DEVICE_ID_ATI_RS350_200     0x7833
-#define PCI_DEVICE_ID_ATI_RS400_100     0x5a30
-#define PCI_DEVICE_ID_ATI_RS400_133     0x5a31
-#define PCI_DEVICE_ID_ATI_RS400_166     0x5a32
-#define PCI_DEVICE_ID_ATI_RS400_200     0x5a33
-#define PCI_DEVICE_ID_ATI_RS480         0x5950
 /* ATI IXP Chipset */
-#define PCI_DEVICE_ID_ATI_IXP200_IDE    0x4349
-#define PCI_DEVICE_ID_ATI_IXP300_IDE    0x4369
-#define PCI_DEVICE_ID_ATI_IXP300_SATA   0x436e
-#define PCI_DEVICE_ID_ATI_IXP400_IDE    0x4376
-#define PCI_DEVICE_ID_ATI_IXP400_SATA   0x4379
-                                                                                
+#define PCI_DEVICE_ID_ATI_IXP_IDE      0x4349
+
 #define PCI_VENDOR_ID_VLSI             0x1004
 #define PCI_DEVICE_ID_VLSI_82C592      0x0005
 #define PCI_DEVICE_ID_VLSI_82C593      0x0006
@@ -534,9 +521,7 @@
 #define PCI_VENDOR_ID_AI               0x1025
 #define PCI_DEVICE_ID_AI_M1435         0x1435
 
-#define PCI_VENDOR_ID_DELL             0x1028
-#define PCI_DEVICE_ID_DELL_RACIII      0x0008
-#define PCI_DEVICE_ID_DELL_RAC4                0x0012
+#define PCI_VENDOR_ID_DELL              0x1028
 
 #define PCI_VENDOR_ID_MATROX           0x102B
 #define PCI_DEVICE_ID_MATROX_MGA_2     0x0518
@@ -584,7 +569,6 @@
 #define PCI_DEVICE_ID_NEC_PCX2         0x0046 /* PowerVR */
 #define PCI_DEVICE_ID_NEC_NILE4                0x005a
 #define PCI_DEVICE_ID_NEC_VRC5476       0x009b
-#define PCI_DEVICE_ID_NEC_VRC4173      0x00a5
 #define PCI_DEVICE_ID_NEC_VRC5477_AC97  0x00a6
 #define PCI_DEVICE_ID_NEC_PC9821CS01    0x800c /* PC-9821-CS01 */
 #define PCI_DEVICE_ID_NEC_PC9821NRB06   0x800d /* PC-9821NR-B06 */
@@ -1030,7 +1014,6 @@
 #define PCI_DEVICE_ID_AL_M1531         0x1531
 #define PCI_DEVICE_ID_AL_M1533         0x1533
 #define PCI_DEVICE_ID_AL_M1541         0x1541
-#define PCI_DEVICE_ID_AL_M1543         0x1543
 #define PCI_DEVICE_ID_AL_M1563         0x1563
 #define PCI_DEVICE_ID_AL_M1621         0x1621
 #define PCI_DEVICE_ID_AL_M1631         0x1631
@@ -1102,11 +1085,9 @@
 #define PCI_DEVICE_ID_NVIDIA_NVENET_8          0x0056
 #define PCI_DEVICE_ID_NVIDIA_NVENET_9          0x0057
 #define PCI_DEVICE_ID_NVIDIA_CK804_AUDIO       0x0059
-#define PCI_DEVICE_ID_NVIDIA_NFORCE2_SMBUS     0x0064
 #define PCI_DEVICE_ID_NVIDIA_NFORCE2_IDE       0x0065
 #define PCI_DEVICE_ID_NVIDIA_NVENET_2          0x0066
 #define PCI_DEVICE_ID_NVIDIA_MCP2_AUDIO                0x006a
-#define PCI_DEVICE_ID_NVIDIA_NFORCE2S_SMBUS    0x0084
 #define PCI_DEVICE_ID_NVIDIA_NFORCE2S_IDE      0x0085
 #define PCI_DEVICE_ID_NVIDIA_NVENET_4          0x0086
 #define PCI_DEVICE_ID_NVIDIA_NVENET_5          0x008c
@@ -1115,7 +1096,6 @@
 #define PCI_DEVICE_ID_NVIDIA_NFORCE3           0x00d1
 #define PCI_DEVICE_ID_NVIDIA_MCP3_AUDIO                0x00da
 #define PCI_DEVICE_ID_NVIDIA_NFORCE3S                  0x00e1
-#define PCI_DEVICE_ID_NVIDIA_NFORCE3_SMBUS     0x00d4
 #define PCI_DEVICE_ID_NVIDIA_NFORCE3_IDE       0x00d5
 #define PCI_DEVICE_ID_NVIDIA_NVENET_3          0x00d6
 #define PCI_DEVICE_ID_NVIDIA_MCP3_AUDIO                0x00da
@@ -1163,7 +1143,6 @@
 #define PCI_DEVICE_ID_NVIDIA_QUADRO4_900XGL    0x0258
 #define PCI_DEVICE_ID_NVIDIA_QUADRO4_750XGL    0x0259
 #define PCI_DEVICE_ID_NVIDIA_QUADRO4_700XGL    0x025B
-#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_GO_5200        0x0329
 
 #define PCI_VENDOR_ID_IMS              0x10e0
 #define PCI_DEVICE_ID_IMS_8849         0x8849
@@ -1493,9 +1472,6 @@
 #define PCI_DEVICE_ID_ARTOP_AEC7612D   0x8040
 #define PCI_DEVICE_ID_ARTOP_AEC7612SUW 0x8050
 #define PCI_DEVICE_ID_ARTOP_8060       0x8060
-#define PCI_DEVICE_ID_ARTOP_AEC67160   0x8080
-#define PCI_DEVICE_ID_ARTOP_AEC67160_2 0x8081
-#define PCI_DEVICE_ID_ARTOP_AEC67162   0x808a
 
 #define PCI_VENDOR_ID_ZEITNET          0x1193
 #define PCI_DEVICE_ID_ZEITNET_1221     0x0001
@@ -1651,10 +1627,6 @@
 #define PCI_DEVICE_ID_OPTIBASE_VPLEXCC 0x2120
 #define PCI_DEVICE_ID_OPTIBASE_VQUEST  0x2130
 
-/* Allied Telesyn */
-#define PCI_VENDOR_ID_AT               0x1259
-#define PCI_SUBDEVICE_ID_AT_2701FX     0x2703
-
 #define PCI_VENDOR_ID_ESS              0x125d
 #define PCI_DEVICE_ID_ESS_ESS1968      0x1968
 #define PCI_DEVICE_ID_ESS_AUDIOPCI     0x1969
@@ -1681,7 +1653,6 @@
 #define PCI_VENDOR_ID_ITE              0x1283
 #define PCI_DEVICE_ID_ITE_IT8172G      0x8172
 #define PCI_DEVICE_ID_ITE_IT8172G_AUDIO 0x0801
-#define PCI_DEVICE_ID_ITE_8211         0x8211
 #define PCI_DEVICE_ID_ITE_8212         0x8212
 #define PCI_DEVICE_ID_ITE_8872         0x8872
 #define PCI_DEVICE_ID_ITE_IT8330G_0    0xe886
@@ -1825,21 +1796,8 @@
 #define PCI_DEVICE_ID_APPLICOM_PCI2000PFB 0x0003
 
 #define PCI_VENDOR_ID_MOXA             0x1393
-#define PCI_DEVICE_ID_MOXA_RC7000      0x0001
-#define PCI_DEVICE_ID_MOXA_CP102       0x1020
-#define PCI_DEVICE_ID_MOXA_CP102UL     0x1021
-#define PCI_DEVICE_ID_MOXA_CP102U      0x1022
 #define PCI_DEVICE_ID_MOXA_C104                0x1040
-#define PCI_DEVICE_ID_MOXA_CP104U      0x1041
-#define PCI_DEVICE_ID_MOXA_CP104JU     0x1042
-#define PCI_DEVICE_ID_MOXA_CT114       0x1140
-#define PCI_DEVICE_ID_MOXA_CP114       0x1141
-#define PCI_DEVICE_ID_MOXA_CP118U      0x1180
-#define PCI_DEVICE_ID_MOXA_CP132       0x1320
-#define PCI_DEVICE_ID_MOXA_CP132U      0x1321
-#define PCI_DEVICE_ID_MOXA_CP134U      0x1340
 #define PCI_DEVICE_ID_MOXA_C168                0x1680
-#define PCI_DEVICE_ID_MOXA_CP168U      0x1681
 #define PCI_DEVICE_ID_MOXA_CP204J      0x2040
 #define PCI_DEVICE_ID_MOXA_C218                0x2180
 #define PCI_DEVICE_ID_MOXA_C320                0x3200
@@ -1964,15 +1922,11 @@
 #define PCI_DEVICE_ID_TIGON3_5704S     0x16a8
 #define PCI_DEVICE_ID_TIGON3_5702A3    0x16c6
 #define PCI_DEVICE_ID_TIGON3_5703A3    0x16c7
-#define PCI_DEVICE_ID_TIGON3_5781      0x16dd
-#define PCI_DEVICE_ID_TIGON3_5753      0x16f7
-#define PCI_DEVICE_ID_TIGON3_5753M     0x16fd
-#define PCI_DEVICE_ID_TIGON3_5753F     0x16fe
 #define PCI_DEVICE_ID_TIGON3_5901      0x170d
-#define PCI_DEVICE_ID_BCM4401B1                0x170c
 #define PCI_DEVICE_ID_TIGON3_5901_2    0x170e
 #define PCI_DEVICE_ID_BCM4401          0x4401
 #define PCI_DEVICE_ID_BCM4401B0                0x4402
+#define PCI_DEVICE_ID_BCM4401B1                0x170c
 
 #define PCI_VENDOR_ID_ENE              0x1524
 #define PCI_DEVICE_ID_ENE_1211         0x1211
@@ -2251,30 +2205,6 @@
 #define PCI_DEVICE_ID_INTEL_ICH6_17    0x266d
 #define PCI_DEVICE_ID_INTEL_ICH6_18    0x266e
 #define PCI_DEVICE_ID_INTEL_ICH6_19    0x266f
-#define PCI_DEVICE_ID_INTEL_ICH7_0     0x27b0
-#define PCI_DEVICE_ID_INTEL_ICH7_1     0x27b1
-#define PCI_DEVICE_ID_INTEL_ICH7_2     0x27c0
-#define PCI_DEVICE_ID_INTEL_ICH7_3     0x27c1
-#define PCI_DEVICE_ID_INTEL_ICH7_4     0x27c2
-#define PCI_DEVICE_ID_INTEL_ICH7_5     0x27c4
-#define PCI_DEVICE_ID_INTEL_ICH7_6     0x27c5
-#define PCI_DEVICE_ID_INTEL_ICH7_7     0x27c8
-#define PCI_DEVICE_ID_INTEL_ICH7_8     0x27c9
-#define PCI_DEVICE_ID_INTEL_ICH7_9     0x27ca
-#define PCI_DEVICE_ID_INTEL_ICH7_10    0x27cb
-#define PCI_DEVICE_ID_INTEL_ICH7_11    0x27cc
-#define PCI_DEVICE_ID_INTEL_ICH7_12    0x27d0
-#define PCI_DEVICE_ID_INTEL_ICH7_13    0x27d2
-#define PCI_DEVICE_ID_INTEL_ICH7_14    0x27d4
-#define PCI_DEVICE_ID_INTEL_ICH7_15    0x27d6
-#define PCI_DEVICE_ID_INTEL_ICH7_16    0x27d8
-#define PCI_DEVICE_ID_INTEL_ICH7_17    0x27da
-#define PCI_DEVICE_ID_INTEL_ICH7_18    0x27dc
-#define PCI_DEVICE_ID_INTEL_ICH7_19    0x27dd
-#define PCI_DEVICE_ID_INTEL_ICH7_20    0x27de
-#define PCI_DEVICE_ID_INTEL_ICH7_21    0x27df
-#define PCI_DEVICE_ID_INTEL_ICH7_22    0x27e0
-#define PCI_DEVICE_ID_INTEL_ICH7_23    0x27e2
 #define PCI_DEVICE_ID_INTEL_82855PM_HB 0x3340
 #define PCI_DEVICE_ID_INTEL_82830_HB   0x3575
 #define PCI_DEVICE_ID_INTEL_82830_CGC  0x3577