diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-30 14:16:30 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-30 14:16:30 -0400 |
| commit | 6b39374a27eb4be7e9d82145ae270ba02ea90dc8 (patch) | |
| tree | 09933113cf28f253db1dd539463bdab741d67139 /include/linux | |
| parent | 62c592edead3c3a045662595f7ade3c12f133373 (diff) | |
| parent | ed735ccbefaf7e5e3ef61418f7e209b8c59308a7 (diff) | |
Merge refs/heads/upstream from master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/pci_ids.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 499a5325f67f..d513c1634006 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -2145,6 +2145,7 @@ | |||
| 2145 | #define PCI_DEVICE_ID_ENE_1225 0x1225 | 2145 | #define PCI_DEVICE_ID_ENE_1225 0x1225 |
| 2146 | #define PCI_DEVICE_ID_ENE_1410 0x1410 | 2146 | #define PCI_DEVICE_ID_ENE_1410 0x1410 |
| 2147 | #define PCI_DEVICE_ID_ENE_1420 0x1420 | 2147 | #define PCI_DEVICE_ID_ENE_1420 0x1420 |
| 2148 | #define PCI_VENDOR_ID_CHELSIO 0x1425 | ||
| 2148 | 2149 | ||
| 2149 | #define PCI_VENDOR_ID_SYBA 0x1592 | 2150 | #define PCI_VENDOR_ID_SYBA 0x1592 |
| 2150 | #define PCI_DEVICE_ID_SYBA_2P_EPP 0x0782 | 2151 | #define PCI_DEVICE_ID_SYBA_2P_EPP 0x0782 |