diff options
| author | David S. Miller <davem@davemloft.net> | 2009-02-24 06:50:29 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-24 06:50:29 -0500 |
| commit | e70049b9e74267dd47e1ffa62302073487afcb48 (patch) | |
| tree | 2cd000c0751ef31c9044b020d63f278cdf4f332d /include/linux/pci_ids.h | |
| parent | d18921a0e319ab512f8186b1b1142c7b8634c779 (diff) | |
| parent | f7e603ad8f78cd3b59e33fa72707da0cbabdf699 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'include/linux/pci_ids.h')
| -rw-r--r-- | include/linux/pci_ids.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 966e02332990..3f9687a71e32 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -1314,6 +1314,7 @@ | |||
| 1314 | #define PCI_DEVICE_ID_VIA_VT3351 0x0351 | 1314 | #define PCI_DEVICE_ID_VIA_VT3351 0x0351 |
| 1315 | #define PCI_DEVICE_ID_VIA_VT3364 0x0364 | 1315 | #define PCI_DEVICE_ID_VIA_VT3364 0x0364 |
| 1316 | #define PCI_DEVICE_ID_VIA_8371_0 0x0391 | 1316 | #define PCI_DEVICE_ID_VIA_8371_0 0x0391 |
| 1317 | #define PCI_DEVICE_ID_VIA_6415 0x0415 | ||
| 1317 | #define PCI_DEVICE_ID_VIA_8501_0 0x0501 | 1318 | #define PCI_DEVICE_ID_VIA_8501_0 0x0501 |
| 1318 | #define PCI_DEVICE_ID_VIA_82C561 0x0561 | 1319 | #define PCI_DEVICE_ID_VIA_82C561 0x0561 |
| 1319 | #define PCI_DEVICE_ID_VIA_82C586_1 0x0571 | 1320 | #define PCI_DEVICE_ID_VIA_82C586_1 0x0571 |
| @@ -1446,6 +1447,7 @@ | |||
| 1446 | #define PCI_DEVICE_ID_DIGI_DF_M_E 0x0071 | 1447 | #define PCI_DEVICE_ID_DIGI_DF_M_E 0x0071 |
| 1447 | #define PCI_DEVICE_ID_DIGI_DF_M_IOM2_A 0x0072 | 1448 | #define PCI_DEVICE_ID_DIGI_DF_M_IOM2_A 0x0072 |
| 1448 | #define PCI_DEVICE_ID_DIGI_DF_M_A 0x0073 | 1449 | #define PCI_DEVICE_ID_DIGI_DF_M_A 0x0073 |
| 1450 | #define PCI_DEVICE_ID_DIGI_NEO_8 0x00B1 | ||
| 1449 | #define PCI_DEVICE_ID_NEO_2DB9 0x00C8 | 1451 | #define PCI_DEVICE_ID_NEO_2DB9 0x00C8 |
| 1450 | #define PCI_DEVICE_ID_NEO_2DB9PRI 0x00C9 | 1452 | #define PCI_DEVICE_ID_NEO_2DB9PRI 0x00C9 |
| 1451 | #define PCI_DEVICE_ID_NEO_2RJ45 0x00CA | 1453 | #define PCI_DEVICE_ID_NEO_2RJ45 0x00CA |
| @@ -2327,6 +2329,9 @@ | |||
| 2327 | #define PCI_DEVICE_ID_INTEL_82378 0x0484 | 2329 | #define PCI_DEVICE_ID_INTEL_82378 0x0484 |
| 2328 | #define PCI_DEVICE_ID_INTEL_I960 0x0960 | 2330 | #define PCI_DEVICE_ID_INTEL_I960 0x0960 |
| 2329 | #define PCI_DEVICE_ID_INTEL_I960RM 0x0962 | 2331 | #define PCI_DEVICE_ID_INTEL_I960RM 0x0962 |
| 2332 | #define PCI_DEVICE_ID_INTEL_8257X_SOL 0x1062 | ||
| 2333 | #define PCI_DEVICE_ID_INTEL_82573E_SOL 0x1085 | ||
| 2334 | #define PCI_DEVICE_ID_INTEL_82573L_SOL 0x108F | ||
| 2330 | #define PCI_DEVICE_ID_INTEL_82815_MC 0x1130 | 2335 | #define PCI_DEVICE_ID_INTEL_82815_MC 0x1130 |
| 2331 | #define PCI_DEVICE_ID_INTEL_82815_CGC 0x1132 | 2336 | #define PCI_DEVICE_ID_INTEL_82815_CGC 0x1132 |
| 2332 | #define PCI_DEVICE_ID_INTEL_82092AA_0 0x1221 | 2337 | #define PCI_DEVICE_ID_INTEL_82092AA_0 0x1221 |