diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-03-01 00:24:34 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-03-01 00:24:34 -0800 |
| commit | 9dfd7048bc6006a7405a88b17187d5118159157b (patch) | |
| tree | fb12837f4058f607294c6e88e9531e159acb0699 /include/linux | |
| parent | 2fb9997650bd482c77d9064fee3e2ddb5aa181f0 (diff) | |
| parent | 25f34d0f108e72f383b69751f2722f253e31ef4d (diff) | |
Merge bk://bk.arm.linux.org.uk/linux-2.6-serial
into ppc970.osdl.org:/home/torvalds/v2.6/linux
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 |