diff options
| author | Dave Jones <davej@redhat.com> | 2005-11-21 09:56:52 -0500 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2005-11-21 09:56:52 -0500 |
| commit | e7e37ee9c547213d726b29c2510cbb6696050405 (patch) | |
| tree | 50c45625de666b23f209d79eb1bfae05c64feee9 /include/linux/pci_ids.h | |
| parent | c243f1f1f6545985afcc6adf1fc085729029c3ee (diff) | |
| parent | db93a82fa9d8b4d6e31c227922eaae829253bb88 (diff) | |
Merge ../linus/
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 c99a83f88dc9..1e737e269db9 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -620,6 +620,7 @@ | |||
| 620 | #define PCI_DEVICE_ID_SI_961 0x0961 | 620 | #define PCI_DEVICE_ID_SI_961 0x0961 |
| 621 | #define PCI_DEVICE_ID_SI_962 0x0962 | 621 | #define PCI_DEVICE_ID_SI_962 0x0962 |
| 622 | #define PCI_DEVICE_ID_SI_963 0x0963 | 622 | #define PCI_DEVICE_ID_SI_963 0x0963 |
| 623 | #define PCI_DEVICE_ID_SI_965 0x0965 | ||
| 623 | #define PCI_DEVICE_ID_SI_5511 0x5511 | 624 | #define PCI_DEVICE_ID_SI_5511 0x5511 |
| 624 | #define PCI_DEVICE_ID_SI_5513 0x5513 | 625 | #define PCI_DEVICE_ID_SI_5513 0x5513 |
| 625 | #define PCI_DEVICE_ID_SI_5518 0x5518 | 626 | #define PCI_DEVICE_ID_SI_5518 0x5518 |
| @@ -1235,6 +1236,7 @@ | |||
| 1235 | #define PCI_DEVICE_ID_VIA_8703_51_0 0x3148 | 1236 | #define PCI_DEVICE_ID_VIA_8703_51_0 0x3148 |
| 1236 | #define PCI_DEVICE_ID_VIA_8237_SATA 0x3149 | 1237 | #define PCI_DEVICE_ID_VIA_8237_SATA 0x3149 |
| 1237 | #define PCI_DEVICE_ID_VIA_XN266 0x3156 | 1238 | #define PCI_DEVICE_ID_VIA_XN266 0x3156 |
| 1239 | #define PCI_DEVICE_ID_VIA_6410 0x3164 | ||
| 1238 | #define PCI_DEVICE_ID_VIA_8754C_0 0x3168 | 1240 | #define PCI_DEVICE_ID_VIA_8754C_0 0x3168 |
| 1239 | #define PCI_DEVICE_ID_VIA_8235 0x3177 | 1241 | #define PCI_DEVICE_ID_VIA_8235 0x3177 |
| 1240 | #define PCI_DEVICE_ID_VIA_8385_0 0x3188 | 1242 | #define PCI_DEVICE_ID_VIA_8385_0 0x3188 |
| @@ -1402,6 +1404,7 @@ | |||
| 1402 | #define PCI_SUBDEVICE_ID_KEYSPAN_SX2 0x5334 | 1404 | #define PCI_SUBDEVICE_ID_KEYSPAN_SX2 0x5334 |
| 1403 | 1405 | ||
| 1404 | #define PCI_VENDOR_ID_MARVELL 0x11ab | 1406 | #define PCI_VENDOR_ID_MARVELL 0x11ab |
| 1407 | #define PCI_DEVICE_ID_MARVELL_GT64111 0x4146 | ||
| 1405 | #define PCI_DEVICE_ID_MARVELL_GT64260 0x6430 | 1408 | #define PCI_DEVICE_ID_MARVELL_GT64260 0x6430 |
| 1406 | #define PCI_DEVICE_ID_MARVELL_MV64360 0x6460 | 1409 | #define PCI_DEVICE_ID_MARVELL_MV64360 0x6460 |
| 1407 | #define PCI_DEVICE_ID_MARVELL_MV64460 0x6480 | 1410 | #define PCI_DEVICE_ID_MARVELL_MV64460 0x6480 |