diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-06-08 15:24:46 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-06-08 15:24:46 -0400 |
| commit | d15a88fc21ef225768ce31be16edfc9c6e2e02e3 (patch) | |
| tree | d4cb0a1bc97973bb947e2667ae56bc4bc2256e9d /include/linux/pci_ids.h | |
| parent | b53471711f21ba0e151075f0e1d6d531eb50f1b1 (diff) | |
| parent | 1def630a6a49dda5bc89dfbd86656293640456f0 (diff) | |
Merge branch 'master' into upstream
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 dce2534ab7dc..c3fe769c9129 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -1240,6 +1240,7 @@ | |||
| 1240 | #define PCI_DEVICE_ID_VIA_8380_0 0x0204 | 1240 | #define PCI_DEVICE_ID_VIA_8380_0 0x0204 |
| 1241 | #define PCI_DEVICE_ID_VIA_3238_0 0x0238 | 1241 | #define PCI_DEVICE_ID_VIA_3238_0 0x0238 |
| 1242 | #define PCI_DEVICE_ID_VIA_PT880 0x0258 | 1242 | #define PCI_DEVICE_ID_VIA_PT880 0x0258 |
| 1243 | #define PCI_DEVICE_ID_VIA_PT880ULTRA 0x0308 | ||
| 1243 | #define PCI_DEVICE_ID_VIA_PX8X0_0 0x0259 | 1244 | #define PCI_DEVICE_ID_VIA_PX8X0_0 0x0259 |
| 1244 | #define PCI_DEVICE_ID_VIA_3269_0 0x0269 | 1245 | #define PCI_DEVICE_ID_VIA_3269_0 0x0269 |
| 1245 | #define PCI_DEVICE_ID_VIA_K8T800PRO_0 0x0282 | 1246 | #define PCI_DEVICE_ID_VIA_K8T800PRO_0 0x0282 |