diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-06-11 23:04:37 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-06-11 23:04:37 -0400 |
| commit | fec69a97489f961026e24536dbb7b86ac663948c (patch) | |
| tree | 869713470d81ebc261598489a2711960336c7c37 /include/linux/pci_ids.h | |
| parent | 1049cb478783c74ca8c99ef70e7d2bf920b9335b (diff) | |
| parent | 2f9719b61e1fcf7422a016ac4f2420a0cc6ba320 (diff) | |
Merge branch 'upstream-fixes' into upstream
Conflicts:
drivers/scsi/sata_sil24.c
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 e75727954a12..55dc8ac3f020 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -1235,6 +1235,7 @@ | |||
| 1235 | #define PCI_DEVICE_ID_VIA_8380_0 0x0204 | 1235 | #define PCI_DEVICE_ID_VIA_8380_0 0x0204 |
| 1236 | #define PCI_DEVICE_ID_VIA_3238_0 0x0238 | 1236 | #define PCI_DEVICE_ID_VIA_3238_0 0x0238 |
| 1237 | #define PCI_DEVICE_ID_VIA_PT880 0x0258 | 1237 | #define PCI_DEVICE_ID_VIA_PT880 0x0258 |
| 1238 | #define PCI_DEVICE_ID_VIA_PT880ULTRA 0x0308 | ||
| 1238 | #define PCI_DEVICE_ID_VIA_PX8X0_0 0x0259 | 1239 | #define PCI_DEVICE_ID_VIA_PX8X0_0 0x0259 |
| 1239 | #define PCI_DEVICE_ID_VIA_3269_0 0x0269 | 1240 | #define PCI_DEVICE_ID_VIA_3269_0 0x0269 |
| 1240 | #define PCI_DEVICE_ID_VIA_K8T800PRO_0 0x0282 | 1241 | #define PCI_DEVICE_ID_VIA_K8T800PRO_0 0x0282 |