diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-07 13:44:22 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-07 13:44:22 -0500 |
| commit | cc918c7ab7da017bfaf9661420bb5c462e057cfb (patch) | |
| tree | 36198fe17267200131ec6c3df7c046a857f76b8d /include | |
| parent | f9c5d0451b406a6bd0d0bf1fdd63c7777af6ebc6 (diff) | |
| parent | dd68e88c72ac9ad25052065c4a443326eda6a052 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-serial
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/pci_ids.h | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index a213e999de31..c3caa93efb10 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -1583,6 +1583,23 @@ | |||
| 1583 | #define PCI_SUBDEVICE_ID_CONNECT_TECH_BH8_485_2_6 0x0009 | 1583 | #define PCI_SUBDEVICE_ID_CONNECT_TECH_BH8_485_2_6 0x0009 |
| 1584 | #define PCI_SUBDEVICE_ID_CONNECT_TECH_BH081101V1 0x000A | 1584 | #define PCI_SUBDEVICE_ID_CONNECT_TECH_BH081101V1 0x000A |
| 1585 | #define PCI_SUBDEVICE_ID_CONNECT_TECH_BH041101V1 0x000B | 1585 | #define PCI_SUBDEVICE_ID_CONNECT_TECH_BH041101V1 0x000B |
| 1586 | #define PCI_SUBDEVICE_ID_CONNECT_TECH_BH2_20MHZ 0x000C | ||
| 1587 | #define PCI_SUBDEVICE_ID_CONNECT_TECH_BH2_PTM 0x000D | ||
| 1588 | #define PCI_SUBDEVICE_ID_CONNECT_TECH_NT960PCI 0x0100 | ||
| 1589 | #define PCI_SUBDEVICE_ID_CONNECT_TECH_TITAN_2 0x0201 | ||
| 1590 | #define PCI_SUBDEVICE_ID_CONNECT_TECH_TITAN_4 0x0202 | ||
| 1591 | #define PCI_SUBDEVICE_ID_CONNECT_TECH_PCI_UART_2_232 0x0300 | ||
| 1592 | #define PCI_SUBDEVICE_ID_CONNECT_TECH_PCI_UART_4_232 0x0301 | ||
| 1593 | #define PCI_SUBDEVICE_ID_CONNECT_TECH_PCI_UART_8_232 0x0302 | ||
| 1594 | #define PCI_SUBDEVICE_ID_CONNECT_TECH_PCI_UART_1_1 0x0310 | ||
| 1595 | #define PCI_SUBDEVICE_ID_CONNECT_TECH_PCI_UART_2_2 0x0311 | ||
| 1596 | #define PCI_SUBDEVICE_ID_CONNECT_TECH_PCI_UART_4_4 0x0312 | ||
| 1597 | #define PCI_SUBDEVICE_ID_CONNECT_TECH_PCI_UART_2 0x0320 | ||
| 1598 | #define PCI_SUBDEVICE_ID_CONNECT_TECH_PCI_UART_4 0x0321 | ||
| 1599 | #define PCI_SUBDEVICE_ID_CONNECT_TECH_PCI_UART_8 0x0322 | ||
| 1600 | #define PCI_SUBDEVICE_ID_CONNECT_TECH_PCI_UART_2_485 0x0330 | ||
| 1601 | #define PCI_SUBDEVICE_ID_CONNECT_TECH_PCI_UART_4_485 0x0331 | ||
| 1602 | #define PCI_SUBDEVICE_ID_CONNECT_TECH_PCI_UART_8_485 0x0332 | ||
| 1586 | 1603 | ||
| 1587 | 1604 | ||
| 1588 | #define PCI_VENDOR_ID_NVIDIA_SGS 0x12d2 | 1605 | #define PCI_VENDOR_ID_NVIDIA_SGS 0x12d2 |