diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-11 02:10:07 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-11 02:10:07 -0400 |
| commit | e14eee56c2280953c6e3d24d5dce42bd90836b81 (patch) | |
| tree | 21ab792d9ad6fbbab460058f352a0158f995644e /include/linux/pci_ids.h | |
| parent | d6ee6f7e4c74d9a0fed7544f4d389bde004651d3 (diff) | |
| parent | 99adcd9d67aaf04e28f5ae96df280f236bde4b66 (diff) | |
Merge commit 'origin/master' into next
Diffstat (limited to 'include/linux/pci_ids.h')
| -rw-r--r-- | include/linux/pci_ids.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 807f1ad8b760..f37fe506105e 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -1445,6 +1445,7 @@ | |||
| 1445 | #define PCI_DEVICE_ID_DIGI_DF_M_E 0x0071 | 1445 | #define PCI_DEVICE_ID_DIGI_DF_M_E 0x0071 |
| 1446 | #define PCI_DEVICE_ID_DIGI_DF_M_IOM2_A 0x0072 | 1446 | #define PCI_DEVICE_ID_DIGI_DF_M_IOM2_A 0x0072 |
| 1447 | #define PCI_DEVICE_ID_DIGI_DF_M_A 0x0073 | 1447 | #define PCI_DEVICE_ID_DIGI_DF_M_A 0x0073 |
| 1448 | #define PCI_DEVICE_ID_DIGI_NEO_8 0x00B1 | ||
| 1448 | #define PCI_DEVICE_ID_NEO_2DB9 0x00C8 | 1449 | #define PCI_DEVICE_ID_NEO_2DB9 0x00C8 |
| 1449 | #define PCI_DEVICE_ID_NEO_2DB9PRI 0x00C9 | 1450 | #define PCI_DEVICE_ID_NEO_2DB9PRI 0x00C9 |
| 1450 | #define PCI_DEVICE_ID_NEO_2RJ45 0x00CA | 1451 | #define PCI_DEVICE_ID_NEO_2RJ45 0x00CA |
| @@ -2330,6 +2331,9 @@ | |||
| 2330 | #define PCI_DEVICE_ID_INTEL_82378 0x0484 | 2331 | #define PCI_DEVICE_ID_INTEL_82378 0x0484 |
| 2331 | #define PCI_DEVICE_ID_INTEL_I960 0x0960 | 2332 | #define PCI_DEVICE_ID_INTEL_I960 0x0960 |
| 2332 | #define PCI_DEVICE_ID_INTEL_I960RM 0x0962 | 2333 | #define PCI_DEVICE_ID_INTEL_I960RM 0x0962 |
| 2334 | #define PCI_DEVICE_ID_INTEL_8257X_SOL 0x1062 | ||
| 2335 | #define PCI_DEVICE_ID_INTEL_82573E_SOL 0x1085 | ||
| 2336 | #define PCI_DEVICE_ID_INTEL_82573L_SOL 0x108F | ||
| 2333 | #define PCI_DEVICE_ID_INTEL_82815_MC 0x1130 | 2337 | #define PCI_DEVICE_ID_INTEL_82815_MC 0x1130 |
| 2334 | #define PCI_DEVICE_ID_INTEL_82815_CGC 0x1132 | 2338 | #define PCI_DEVICE_ID_INTEL_82815_CGC 0x1132 |
| 2335 | #define PCI_DEVICE_ID_INTEL_82092AA_0 0x1221 | 2339 | #define PCI_DEVICE_ID_INTEL_82092AA_0 0x1221 |