diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:24:00 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:24:00 -0400 |
| commit | 6d72b7952fa7d7c61d021398970c29afde6a4443 (patch) | |
| tree | 31c00be8e2837e2db2e62c694421a93a9f4c79d7 /include/linux/pci_ids.h | |
| parent | 6360b1fbb4a939efd34fc770c2ebd927c55506e0 (diff) | |
| parent | 066519068ad2fbe98c7f45552b1f592903a9c8c8 (diff) | |
Merge branch 'linus' into core/rodata
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 cf6dbd759395..eafc9d6d2b35 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -716,6 +716,7 @@ | |||
| 716 | #define PCI_DEVICE_ID_HP_CISSA 0x3220 | 716 | #define PCI_DEVICE_ID_HP_CISSA 0x3220 |
| 717 | #define PCI_DEVICE_ID_HP_CISSC 0x3230 | 717 | #define PCI_DEVICE_ID_HP_CISSC 0x3230 |
| 718 | #define PCI_DEVICE_ID_HP_CISSD 0x3238 | 718 | #define PCI_DEVICE_ID_HP_CISSD 0x3238 |
| 719 | #define PCI_DEVICE_ID_HP_CISSE 0x323a | ||
| 719 | #define PCI_DEVICE_ID_HP_ZX2_IOC 0x4031 | 720 | #define PCI_DEVICE_ID_HP_ZX2_IOC 0x4031 |
| 720 | 721 | ||
| 721 | #define PCI_VENDOR_ID_PCTECH 0x1042 | 722 | #define PCI_VENDOR_ID_PCTECH 0x1042 |
| @@ -1761,6 +1762,7 @@ | |||
| 1761 | 1762 | ||
| 1762 | #define PCI_VENDOR_ID_INTASHIELD 0x135a | 1763 | #define PCI_VENDOR_ID_INTASHIELD 0x135a |
| 1763 | #define PCI_DEVICE_ID_INTASHIELD_IS200 0x0d80 | 1764 | #define PCI_DEVICE_ID_INTASHIELD_IS200 0x0d80 |
| 1765 | #define PCI_DEVICE_ID_INTASHIELD_IS400 0x0dc0 | ||
| 1764 | 1766 | ||
| 1765 | #define PCI_VENDOR_ID_QUATECH 0x135C | 1767 | #define PCI_VENDOR_ID_QUATECH 0x135C |
| 1766 | #define PCI_DEVICE_ID_QUATECH_QSC100 0x0010 | 1768 | #define PCI_DEVICE_ID_QUATECH_QSC100 0x0010 |
| @@ -2383,6 +2385,9 @@ | |||
| 2383 | #define PCI_DEVICE_ID_INTEL_ICH10_4 0x3a30 | 2385 | #define PCI_DEVICE_ID_INTEL_ICH10_4 0x3a30 |
| 2384 | #define PCI_DEVICE_ID_INTEL_ICH10_5 0x3a60 | 2386 | #define PCI_DEVICE_ID_INTEL_ICH10_5 0x3a60 |
| 2385 | #define PCI_DEVICE_ID_INTEL_IOAT_SNB 0x402f | 2387 | #define PCI_DEVICE_ID_INTEL_IOAT_SNB 0x402f |
| 2388 | #define PCI_DEVICE_ID_INTEL_5400_ERR 0x4030 | ||
| 2389 | #define PCI_DEVICE_ID_INTEL_5400_FBD0 0x4035 | ||
| 2390 | #define PCI_DEVICE_ID_INTEL_5400_FBD1 0x4036 | ||
| 2386 | #define PCI_DEVICE_ID_INTEL_IOAT_SCNB 0x65ff | 2391 | #define PCI_DEVICE_ID_INTEL_IOAT_SCNB 0x65ff |
| 2387 | #define PCI_DEVICE_ID_INTEL_TOLAPAI_0 0x5031 | 2392 | #define PCI_DEVICE_ID_INTEL_TOLAPAI_0 0x5031 |
| 2388 | #define PCI_DEVICE_ID_INTEL_TOLAPAI_1 0x5032 | 2393 | #define PCI_DEVICE_ID_INTEL_TOLAPAI_1 0x5032 |