diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-06-01 05:05:23 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-06-01 05:05:23 -0400 |
| commit | c029cc66cb3d83f70c02e0c182f0eed1419f8020 (patch) | |
| tree | b9ed887a0e6434fedebcbf90b3d2ba1aeff68a01 /include/linux/pci_ids.h | |
| parent | 0a9cb46a73abd6c45e7c986bec984eed60c417b6 (diff) | |
| parent | ba8f5baba79da8eb502f8534c3a8ecb64aceb790 (diff) | |
Merge branch 'merge'
Diffstat (limited to 'include/linux/pci_ids.h')
| -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 d6fe048376ab..590dc6dca315 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -1231,6 +1231,7 @@ | |||
| 1231 | #define PCI_DEVICE_ID_VIA_8380_0 0x0204 | 1231 | #define PCI_DEVICE_ID_VIA_8380_0 0x0204 |
| 1232 | #define PCI_DEVICE_ID_VIA_3238_0 0x0238 | 1232 | #define PCI_DEVICE_ID_VIA_3238_0 0x0238 |
| 1233 | #define PCI_DEVICE_ID_VIA_PT880 0x0258 | 1233 | #define PCI_DEVICE_ID_VIA_PT880 0x0258 |
| 1234 | #define PCI_DEVICE_ID_VIA_PT880ULTRA 0x0308 | ||
| 1234 | #define PCI_DEVICE_ID_VIA_PX8X0_0 0x0259 | 1235 | #define PCI_DEVICE_ID_VIA_PX8X0_0 0x0259 |
| 1235 | #define PCI_DEVICE_ID_VIA_3269_0 0x0269 | 1236 | #define PCI_DEVICE_ID_VIA_3269_0 0x0269 |
| 1236 | #define PCI_DEVICE_ID_VIA_K8T800PRO_0 0x0282 | 1237 | #define PCI_DEVICE_ID_VIA_K8T800PRO_0 0x0282 |