diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-08-28 23:19:55 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-08-28 23:19:55 -0400 |
| commit | d96299537e43681942ea272e00b0e529aa5b5fa4 (patch) | |
| tree | 65e4df4142a7a0eb0ec0bfe70058771731e39194 /include/linux | |
| parent | 1b8b22f44bc68b066c571ca2b5ab4fda123c15bd (diff) | |
| parent | 737c17561fb2c6a72810cca7d7c0b8bdc29bb120 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-serial
* master.kernel.org:/home/rmk/linux-2.6-serial:
[SERIAL] Support for Intashield 2 port PCI serial card
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/pci_ids.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 4eae06b08cf2..4c2839eab7f4 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -1726,6 +1726,9 @@ | |||
| 1726 | #define PCI_VENDOR_ID_DOMEX 0x134a | 1726 | #define PCI_VENDOR_ID_DOMEX 0x134a |
| 1727 | #define PCI_DEVICE_ID_DOMEX_DMX3191D 0x0001 | 1727 | #define PCI_DEVICE_ID_DOMEX_DMX3191D 0x0001 |
| 1728 | 1728 | ||
| 1729 | #define PCI_VENDOR_ID_INTASHIELD 0x135a | ||
| 1730 | #define PCI_DEVICE_ID_INTASHIELD_IS200 0x0d80 | ||
| 1731 | |||
| 1729 | #define PCI_VENDOR_ID_QUATECH 0x135C | 1732 | #define PCI_VENDOR_ID_QUATECH 0x135C |
| 1730 | #define PCI_DEVICE_ID_QUATECH_QSC100 0x0010 | 1733 | #define PCI_DEVICE_ID_QUATECH_QSC100 0x0010 |
| 1731 | #define PCI_DEVICE_ID_QUATECH_DSC100 0x0020 | 1734 | #define PCI_DEVICE_ID_QUATECH_DSC100 0x0020 |