diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-21 13:56:30 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-21 13:56:30 -0500 |
| commit | f9e6bfa141c5bcf3402d98204b7b23b310be9ddb (patch) | |
| tree | 8d1c9b6a232211893dd64306bb1f46313408111c /include/linux | |
| parent | 1a324727caa26cd65a359a958c90fbd251d4aa49 (diff) | |
| parent | e7e37ee9c547213d726b29c2510cbb6696050405 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
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 efb60d06caab..1e737e269db9 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -1199,6 +1199,7 @@ | |||
| 1199 | #define PCI_DEVICE_ID_VIA_3269_0 0x0269 | 1199 | #define PCI_DEVICE_ID_VIA_3269_0 0x0269 |
| 1200 | #define PCI_DEVICE_ID_VIA_K8T800PRO_0 0x0282 | 1200 | #define PCI_DEVICE_ID_VIA_K8T800PRO_0 0x0282 |
| 1201 | #define PCI_DEVICE_ID_VIA_8363_0 0x0305 | 1201 | #define PCI_DEVICE_ID_VIA_8363_0 0x0305 |
| 1202 | #define PCI_DEVICE_ID_VIA_P4M800CE 0x0314 | ||
| 1202 | #define PCI_DEVICE_ID_VIA_8371_0 0x0391 | 1203 | #define PCI_DEVICE_ID_VIA_8371_0 0x0391 |
| 1203 | #define PCI_DEVICE_ID_VIA_8501_0 0x0501 | 1204 | #define PCI_DEVICE_ID_VIA_8501_0 0x0501 |
| 1204 | #define PCI_DEVICE_ID_VIA_82C561 0x0561 | 1205 | #define PCI_DEVICE_ID_VIA_82C561 0x0561 |