diff options
| author | Dave Jones <davej@tetrachloride.(none)> | 2002-12-14 22:42:17 -0100 |
|---|---|---|
| committer | Dave Jones <davej@tetrachloride.(none)> | 2002-12-14 22:42:17 -0100 |
| commit | 89ecfc0b5e0a2bc84a3a0a8b0b331c622e28e602 (patch) | |
| tree | 9c988a91490ff7c1b3110dee22f3be4c2a3f43f9 /include | |
| parent | ee8429084344da4764b012847e32f4905934136e (diff) | |
| parent | 7bf76470c98dd415ade17060b84cbc3a8237b819 (diff) | |
Merge tetrachloride.(none):/mnt/stuff/kernel/2.5/bk-linus
into tetrachloride.(none):/mnt/stuff/kernel/2.5/agpgart
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/agp_backend.h | 1 | ||||
| -rw-r--r-- | include/linux/pci_ids.h | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/agp_backend.h b/include/linux/agp_backend.h index fe59e8cf0378..e6fa886e8d82 100644 --- a/include/linux/agp_backend.h +++ b/include/linux/agp_backend.h @@ -51,6 +51,7 @@ enum chipset_type { INTEL_I850, INTEL_I860, INTEL_460GX, + INTEL_I7505, VIA_GENERIC, VIA_VP3, VIA_MVP3, diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 7c0e1de47668..4f90ff1ccbe8 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -1727,6 +1727,9 @@ #define PCI_DEVICE_ID_INTEL_82092AA_0 0x1221 #define PCI_DEVICE_ID_INTEL_82092AA_1 0x1222 #define PCI_DEVICE_ID_INTEL_7116 0x1223 +#define PCI_DEVICE_ID_INTEL_7505_0 0x2550 +#define PCI_DEVICE_ID_INTEL_7505_1 0x2552 +#define PCI_DEVICE_ID_INTEL_7205_0 0x255d #define PCI_DEVICE_ID_INTEL_82596 0x1226 #define PCI_DEVICE_ID_INTEL_82865 0x1227 #define PCI_DEVICE_ID_INTEL_82557 0x1229 |