diff options
| author | David S. Miller <davem@davemloft.net> | 2008-09-19 18:51:35 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-09-19 18:51:35 -0400 |
| commit | 79b6f7ecdac7a37df72a5f354816c0dd0b6ac592 (patch) | |
| tree | cb709af3ca7425768a596df97ccafbd6b8397d1d /include | |
| parent | 02a1416478b70cd49bd74827438c8ba797784728 (diff) | |
| parent | c4e84bde1d595d857d3c74b49b9c45cc770df792 (diff) | |
Merge branch 'new-drivers' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'include')
| -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 f1624b396754..6f4276d461c0 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -1411,6 +1411,8 @@ | |||
| 1411 | #define PCI_DEVICE_ID_EICON_MAESTRAQ_U 0xe013 | 1411 | #define PCI_DEVICE_ID_EICON_MAESTRAQ_U 0xe013 |
| 1412 | #define PCI_DEVICE_ID_EICON_MAESTRAP 0xe014 | 1412 | #define PCI_DEVICE_ID_EICON_MAESTRAP 0xe014 |
| 1413 | 1413 | ||
| 1414 | #define PCI_VENDOR_ID_CISCO 0x1137 | ||
| 1415 | |||
| 1414 | #define PCI_VENDOR_ID_ZIATECH 0x1138 | 1416 | #define PCI_VENDOR_ID_ZIATECH 0x1138 |
| 1415 | #define PCI_DEVICE_ID_ZIATECH_5550_HC 0x5550 | 1417 | #define PCI_DEVICE_ID_ZIATECH_5550_HC 0x5550 |
| 1416 | 1418 | ||
| @@ -2213,6 +2215,7 @@ | |||
| 2213 | 2215 | ||
| 2214 | #define PCI_VENDOR_ID_ATTANSIC 0x1969 | 2216 | #define PCI_VENDOR_ID_ATTANSIC 0x1969 |
| 2215 | #define PCI_DEVICE_ID_ATTANSIC_L1 0x1048 | 2217 | #define PCI_DEVICE_ID_ATTANSIC_L1 0x1048 |
| 2218 | #define PCI_DEVICE_ID_ATTANSIC_L2 0x2048 | ||
| 2216 | 2219 | ||
| 2217 | #define PCI_VENDOR_ID_JMICRON 0x197B | 2220 | #define PCI_VENDOR_ID_JMICRON 0x197B |
| 2218 | #define PCI_DEVICE_ID_JMICRON_JMB360 0x2360 | 2221 | #define PCI_DEVICE_ID_JMICRON_JMB360 0x2360 |