Merge commit 'origin/master' into next

[safe/jmp/linux-2.6] / include / linux / pci_ids.h

diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index cb14fd2..d77c237 100644 (file)
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -526,6 +526,7 @@
 #define PCI_DEVICE_ID_AMD_OPUS_7443    0x7443
 #define PCI_DEVICE_ID_AMD_VIPER_7443   0x7443
 #define PCI_DEVICE_ID_AMD_OPUS_7445    0x7445
+#define PCI_DEVICE_ID_AMD_8111_PCI     0x7460
 #define PCI_DEVICE_ID_AMD_8111_LPC     0x7468
 #define PCI_DEVICE_ID_AMD_8111_IDE     0x7469
 #define PCI_DEVICE_ID_AMD_8111_SMBUS2  0x746a
@@ -943,6 +944,32 @@
 #define PCI_DEVICE_ID_SUN_TOMATILLO    0xa801
 #define PCI_DEVICE_ID_SUN_CASSINI      0xabba
 
+#define PCI_VENDOR_ID_NI               0x1093
+#define PCI_DEVICE_ID_NI_PCI2322       0xd130
+#define PCI_DEVICE_ID_NI_PCI2324       0xd140
+#define PCI_DEVICE_ID_NI_PCI2328       0xd150
+#define PCI_DEVICE_ID_NI_PXI8422_2322  0xd190
+#define PCI_DEVICE_ID_NI_PXI8422_2324  0xd1a0
+#define PCI_DEVICE_ID_NI_PXI8420_2322  0xd1d0
+#define PCI_DEVICE_ID_NI_PXI8420_2324  0xd1e0
+#define PCI_DEVICE_ID_NI_PXI8420_2328  0xd1f0
+#define PCI_DEVICE_ID_NI_PXI8420_23216 0xd1f1
+#define PCI_DEVICE_ID_NI_PCI2322I      0xd250
+#define PCI_DEVICE_ID_NI_PCI2324I      0xd270
+#define PCI_DEVICE_ID_NI_PCI23216      0xd2b0
+#define PCI_DEVICE_ID_NI_PXI8430_2322  0x7080
+#define PCI_DEVICE_ID_NI_PCI8430_2322  0x70db
+#define PCI_DEVICE_ID_NI_PXI8430_2324  0x70dd
+#define PCI_DEVICE_ID_NI_PCI8430_2324  0x70df
+#define PCI_DEVICE_ID_NI_PXI8430_2328  0x70e2
+#define PCI_DEVICE_ID_NI_PCI8430_2328  0x70e4
+#define PCI_DEVICE_ID_NI_PXI8430_23216 0x70e6
+#define PCI_DEVICE_ID_NI_PCI8430_23216 0x70e7
+#define PCI_DEVICE_ID_NI_PXI8432_2322  0x70e8
+#define PCI_DEVICE_ID_NI_PCI8432_2322  0x70ea
+#define PCI_DEVICE_ID_NI_PXI8432_2324  0x70ec
+#define PCI_DEVICE_ID_NI_PCI8432_2324  0x70ee
+
 #define PCI_VENDOR_ID_CMD              0x1095
 #define PCI_DEVICE_ID_CMD_643          0x0643
 #define PCI_DEVICE_ID_CMD_646          0x0646
@@ -1379,7 +1406,7 @@
 #define PCI_DEVICE_ID_VIA_82C598_1     0x8598
 #define PCI_DEVICE_ID_VIA_838X_1       0xB188
 #define PCI_DEVICE_ID_VIA_83_87XX_1    0xB198
-#define PCI_DEVICE_ID_VIA_C409_IDE     0XC409
+#define PCI_DEVICE_ID_VIA_VX855_IDE    0xC409
 #define PCI_DEVICE_ID_VIA_ANON         0xFFFF
 
 #define PCI_VENDOR_ID_SIEMENS           0x110A
@@ -1969,10 +1996,12 @@
 #define PCI_DEVICE_ID_OXSEMI_PCIe952_1_U       0xC118
 #define PCI_DEVICE_ID_OXSEMI_PCIe952_1_GU      0xC11C
 #define PCI_DEVICE_ID_OXSEMI_16PCI954  0x9501
+#define PCI_DEVICE_ID_OXSEMI_C950      0x950B
 #define PCI_DEVICE_ID_OXSEMI_16PCI95N  0x9511
 #define PCI_DEVICE_ID_OXSEMI_16PCI954PP        0x9513
 #define PCI_DEVICE_ID_OXSEMI_16PCI952  0x9521
 #define PCI_DEVICE_ID_OXSEMI_16PCI952PP        0x9523
+#define PCI_SUBDEVICE_ID_OXSEMI_C950   0x0001
 
 #define PCI_VENDOR_ID_CHELSIO          0x1425
 
@@ -2247,6 +2276,8 @@
 #define PCI_DEVICE_ID_MPC8547E         0x0018
 #define PCI_DEVICE_ID_MPC8545E         0x0019
 #define PCI_DEVICE_ID_MPC8545          0x001a
+#define PCI_DEVICE_ID_MPC8569E         0x0061
+#define PCI_DEVICE_ID_MPC8569          0x0060
 #define PCI_DEVICE_ID_MPC8568E         0x0020
 #define PCI_DEVICE_ID_MPC8568          0x0021
 #define PCI_DEVICE_ID_MPC8567E         0x0022
@@ -2259,6 +2290,8 @@
 #define PCI_DEVICE_ID_MPC8572          0x0041
 #define PCI_DEVICE_ID_MPC8536E         0x0050
 #define PCI_DEVICE_ID_MPC8536          0x0051
+#define PCI_DEVICE_ID_P2020E           0x0070
+#define PCI_DEVICE_ID_P2020            0x0071
 #define PCI_DEVICE_ID_MPC8641          0x7010
 #define PCI_DEVICE_ID_MPC8641D         0x7011
 #define PCI_DEVICE_ID_MPC8610          0x7018
@@ -2487,6 +2520,8 @@
 #define PCI_DEVICE_ID_INTEL_IOAT_TBG3  0x3433
 #define PCI_DEVICE_ID_INTEL_82830_HB   0x3575
 #define PCI_DEVICE_ID_INTEL_82830_CGC  0x3577
+#define PCI_DEVICE_ID_INTEL_82854_HB   0x358c
+#define PCI_DEVICE_ID_INTEL_82854_IG   0x358e
 #define PCI_DEVICE_ID_INTEL_82855GM_HB 0x3580
 #define PCI_DEVICE_ID_INTEL_82855GM_IG 0x3582
 #define PCI_DEVICE_ID_INTEL_E7520_MCH  0x3590