diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-01 10:55:46 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-01 10:55:46 -0400 |
| commit | c10fccddf00cb216349ce3171ce2e39d7c70371b (patch) | |
| tree | 039bdc3d2c19ce93c5bde2a5acf0c26e2de80272 /include | |
| parent | 5f64f73957f6cae3222f97f2599199ee562f7f3f (diff) | |
| parent | bcc488ab02254a6e60d749187a632dc3d642d4f8 (diff) | |
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/pci_ids.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 7ccbc2e4272..b0d6134e1ee 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -1230,6 +1230,12 @@ | |||
| 1230 | #define PCI_DEVICE_ID_NVIDIA_QUADRO4_900XGL 0x0258 | 1230 | #define PCI_DEVICE_ID_NVIDIA_QUADRO4_900XGL 0x0258 |
| 1231 | #define PCI_DEVICE_ID_NVIDIA_QUADRO4_750XGL 0x0259 | 1231 | #define PCI_DEVICE_ID_NVIDIA_QUADRO4_750XGL 0x0259 |
| 1232 | #define PCI_DEVICE_ID_NVIDIA_QUADRO4_700XGL 0x025B | 1232 | #define PCI_DEVICE_ID_NVIDIA_QUADRO4_700XGL 0x025B |
| 1233 | #define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_IDE 0x0265 | ||
| 1234 | #define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_SATA 0x0266 | ||
| 1235 | #define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_SATA2 0x0267 | ||
| 1236 | #define PCI_DEVICE_ID_NVIDIA_NVENET_12 0x0268 | ||
| 1237 | #define PCI_DEVICE_ID_NVIDIA_NVENET_13 0x0269 | ||
| 1238 | #define PCI_DEVICE_ID_NVIDIA_MCP51_AUDIO 0x026B | ||
| 1233 | #define PCI_DEVICE_ID_NVIDIA_GEFORCE4_TI_4800 0x0280 | 1239 | #define PCI_DEVICE_ID_NVIDIA_GEFORCE4_TI_4800 0x0280 |
| 1234 | #define PCI_DEVICE_ID_NVIDIA_GEFORCE4_TI_4800_8X 0x0281 | 1240 | #define PCI_DEVICE_ID_NVIDIA_GEFORCE4_TI_4800_8X 0x0281 |
| 1235 | #define PCI_DEVICE_ID_NVIDIA_GEFORCE4_TI_4800SE 0x0282 | 1241 | #define PCI_DEVICE_ID_NVIDIA_GEFORCE4_TI_4800SE 0x0282 |