Commit 47cf8254 authored by Dave Jones's avatar Dave Jones

[AGPGART] i855PM support from Bill Nottingham.

Mainly adding a PCI id, unfortunately, requires
renaming the i855GM PCI ids to avoid name conflict. Also renames some
of the i855GM constants from i855PM to i855GM.
parent fc79e616
...@@ -1386,13 +1386,17 @@ static int __init agp_intel_probe(struct pci_dev *pdev, ...@@ -1386,13 +1386,17 @@ static int __init agp_intel_probe(struct pci_dev *pdev,
bridge = &intel_850_bridge; bridge = &intel_850_bridge;
name = "i850"; name = "i850";
break; break;
case PCI_DEVICE_ID_INTEL_82855_HB: case PCI_DEVICE_ID_INTEL_82855PM_HB:
if (find_i830(PCI_DEVICE_ID_INTEL_82855_IG)) { bridge = &intel_845_bridge;
name = "855PM";
break;
case PCI_DEVICE_ID_INTEL_82855GM_HB:
if (find_i830(PCI_DEVICE_ID_INTEL_82855GM_IG)) {
bridge = &intel_830_bridge; bridge = &intel_830_bridge;
name = "855"; name = "855";
} else { } else {
bridge = &intel_845_bridge; bridge = &intel_845_bridge;
name = "855PM"; name = "855GM";
} }
break; break;
case PCI_DEVICE_ID_INTEL_82860_HB: case PCI_DEVICE_ID_INTEL_82860_HB:
......
...@@ -1904,10 +1904,11 @@ ...@@ -1904,10 +1904,11 @@
#define PCI_DEVICE_ID_INTEL_82845G_IG 0x2562 #define PCI_DEVICE_ID_INTEL_82845G_IG 0x2562
#define PCI_DEVICE_ID_INTEL_82865_HB 0x2570 #define PCI_DEVICE_ID_INTEL_82865_HB 0x2570
#define PCI_DEVICE_ID_INTEL_82865_IG 0x2572 #define PCI_DEVICE_ID_INTEL_82865_IG 0x2572
#define PCI_DEVICE_ID_INTEL_82855PM_HB 0x3340
#define PCI_DEVICE_ID_INTEL_82830_HB 0x3575 #define PCI_DEVICE_ID_INTEL_82830_HB 0x3575
#define PCI_DEVICE_ID_INTEL_82830_CGC 0x3577 #define PCI_DEVICE_ID_INTEL_82830_CGC 0x3577
#define PCI_DEVICE_ID_INTEL_82855_HB 0x3580 #define PCI_DEVICE_ID_INTEL_82855GM_HB 0x3580
#define PCI_DEVICE_ID_INTEL_82855_IG 0x3582 #define PCI_DEVICE_ID_INTEL_82855GM_IG 0x3582
#define PCI_DEVICE_ID_INTEL_80310 0x530d #define PCI_DEVICE_ID_INTEL_80310 0x530d
#define PCI_DEVICE_ID_INTEL_82371SB_0 0x7000 #define PCI_DEVICE_ID_INTEL_82371SB_0 0x7000
#define PCI_DEVICE_ID_INTEL_82371SB_1 0x7010 #define PCI_DEVICE_ID_INTEL_82371SB_1 0x7010
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment