diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-09-06 18:47:31 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-09-06 18:47:31 -0400 |
| commit | c08319a9d50b5c9cb4fdb33728bd16497cf4ddd3 (patch) | |
| tree | 5fbec9030029da1ec387c18b85f26f19ee50da44 /include/linux/pci_ids.h | |
| parent | bfa0d75a1eee59f0577e3c1697ff570b77581a35 (diff) | |
| parent | 4706df3d3c42af802597d82c8b1542c3d52eab23 (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/linux/pci_ids.h')
| -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 d513c1634006..95c941f8c747 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -2147,6 +2147,9 @@ | |||
| 2147 | #define PCI_DEVICE_ID_ENE_1420 0x1420 | 2147 | #define PCI_DEVICE_ID_ENE_1420 0x1420 |
| 2148 | #define PCI_VENDOR_ID_CHELSIO 0x1425 | 2148 | #define PCI_VENDOR_ID_CHELSIO 0x1425 |
| 2149 | 2149 | ||
| 2150 | #define PCI_VENDOR_ID_MIPS 0x153f | ||
| 2151 | #define PCI_DEVICE_ID_SOC_IT 0x0001 | ||
| 2152 | |||
| 2150 | #define PCI_VENDOR_ID_SYBA 0x1592 | 2153 | #define PCI_VENDOR_ID_SYBA 0x1592 |
| 2151 | #define PCI_DEVICE_ID_SYBA_2P_EPP 0x0782 | 2154 | #define PCI_DEVICE_ID_SYBA_2P_EPP 0x0782 |
| 2152 | #define PCI_DEVICE_ID_SYBA_1P_ECP 0x0783 | 2155 | #define PCI_DEVICE_ID_SYBA_1P_ECP 0x0783 |