Merge git://git.infradead.org/~dwmw2/firmware-2.6

[~andy/linux] / include / linux / pci_ids.h

diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 170f8b1f22db1dc7f065e0de8525cb1b80ce4898..ee98cd570885f6f7b8ee8ba61d0546ad929ed872 100644 (file)
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -944,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