diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-07 16:41:30 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-07 16:41:30 -0400 |
| commit | eba4f669d6ec9be4173bb2619e9b8500b3c36542 (patch) | |
| tree | 60178d4f2dd4fa1f8985b38fdbe4cd6b99a58c7a /include/linux/pci_ids.h | |
| parent | 93cffffa19960464a52f9c78d9a6150270d23785 (diff) | |
| parent | 66bb8bf8b235ba4d37fda14375827864977c6a3e (diff) | |
Merge of master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
Diffstat (limited to 'include/linux/pci_ids.h')
| -rw-r--r-- | include/linux/pci_ids.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index b0d6134e1ee6..18f734ec9181 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -2382,6 +2382,8 @@ | |||
| 2382 | #define PCI_DEVICE_ID_INTEL_82915G_IG 0x2582 | 2382 | #define PCI_DEVICE_ID_INTEL_82915G_IG 0x2582 |
| 2383 | #define PCI_DEVICE_ID_INTEL_82915GM_HB 0x2590 | 2383 | #define PCI_DEVICE_ID_INTEL_82915GM_HB 0x2590 |
| 2384 | #define PCI_DEVICE_ID_INTEL_82915GM_IG 0x2592 | 2384 | #define PCI_DEVICE_ID_INTEL_82915GM_IG 0x2592 |
| 2385 | #define PCI_DEVICE_ID_INTEL_82945G_HB 0x2770 | ||
| 2386 | #define PCI_DEVICE_ID_INTEL_82945G_IG 0x2772 | ||
| 2385 | #define PCI_DEVICE_ID_INTEL_ICH6_0 0x2640 | 2387 | #define PCI_DEVICE_ID_INTEL_ICH6_0 0x2640 |
| 2386 | #define PCI_DEVICE_ID_INTEL_ICH6_1 0x2641 | 2388 | #define PCI_DEVICE_ID_INTEL_ICH6_1 0x2641 |
| 2387 | #define PCI_DEVICE_ID_INTEL_ICH6_2 0x2642 | 2389 | #define PCI_DEVICE_ID_INTEL_ICH6_2 0x2642 |