diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2005-07-28 04:30:20 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2005-07-28 04:30:20 -0400 |
| commit | 661299d9d0437a0ff72240f3d60016ac3a361a6e (patch) | |
| tree | 765512576314fc3612b503f182b9ae4e60fcf849 /include/linux/pci_ids.h | |
| parent | 05caac585f8abd6c0113856bc8858e3ef214d8a6 (diff) | |
| parent | 41c018b7ecb60b1c2c4d5dee0cd37d32a94c45af (diff) | |
Merge with Linus' 2.6 tree
Diffstat (limited to 'include/linux/pci_ids.h')
| -rw-r--r-- | include/linux/pci_ids.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index d2ad2c4f835a..bc4cc10fabe9 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -1020,6 +1020,7 @@ | |||
| 1020 | #define PCI_DEVICE_ID_PLX_SPCOM200 0x1103 | 1020 | #define PCI_DEVICE_ID_PLX_SPCOM200 0x1103 |
| 1021 | #define PCI_DEVICE_ID_PLX_DJINN_ITOO 0x1151 | 1021 | #define PCI_DEVICE_ID_PLX_DJINN_ITOO 0x1151 |
| 1022 | #define PCI_DEVICE_ID_PLX_R753 0x1152 | 1022 | #define PCI_DEVICE_ID_PLX_R753 0x1152 |
| 1023 | #define PCI_DEVICE_ID_PLX_OLITEC 0x1187 | ||
| 1023 | #define PCI_DEVICE_ID_PLX_9030 0x9030 | 1024 | #define PCI_DEVICE_ID_PLX_9030 0x9030 |
| 1024 | #define PCI_DEVICE_ID_PLX_9050 0x9050 | 1025 | #define PCI_DEVICE_ID_PLX_9050 0x9050 |
| 1025 | #define PCI_DEVICE_ID_PLX_9060 0x9060 | 1026 | #define PCI_DEVICE_ID_PLX_9060 0x9060 |