diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-03-02 12:56:19 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-03-02 12:56:19 -0500 |
| commit | a51a0aaebafe45a2069fd2dc7975326e4c7f348c (patch) | |
| tree | 9a494d78c6a8231ec06b6065e25e7248f34e47b7 /include/linux | |
| parent | 0f13f7d1e54b992b7834af7673efc592126e43ed (diff) | |
| parent | 1274fcd685ec15f10261f48dc990367c2180d589 (diff) | |
Merge pobox.com:/garz/repo/linux-2.6
into pobox.com:/garz/repo/libata-2.6
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 919fa9768c19..3dca3b53f74b 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -1972,6 +1972,9 @@ #define PCI_DEVICE_ID_BCM4401 0x4401 #define PCI_DEVICE_ID_BCM4401B0 0x4402 +#define PCI_VENDOR_ID_TOPIC 0x151f +#define PCI_DEVICE_ID_TOPIC_TP560 0x0000 + #define PCI_VENDOR_ID_ENE 0x1524 #define PCI_DEVICE_ID_ENE_1211 0x1211 #define PCI_DEVICE_ID_ENE_1225 0x1225 |