diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-06-29 18:21:41 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-06-29 18:21:41 -0400 |
| commit | d18bfacff20f08aecf01bb971b110ca108eef3c7 (patch) | |
| tree | 255f862839c593c796e609328575b611e3f56cf3 /drivers/char/agp/amd64-agp.c | |
| parent | a68db763af9b676590c3fe9ec3f17bf18015eb2f (diff) | |
| parent | fd782a4a99d2d3e818b9465c427b10f7f027d7da (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'drivers/char/agp/amd64-agp.c')
| -rw-r--r-- | drivers/char/agp/amd64-agp.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/char/agp/amd64-agp.c b/drivers/char/agp/amd64-agp.c index 1407945a5892..59f589d733f9 100644 --- a/drivers/char/agp/amd64-agp.c +++ b/drivers/char/agp/amd64-agp.c | |||
| @@ -686,6 +686,15 @@ static struct pci_device_id agp_amd64_pci_table[] = { | |||
| 686 | .subvendor = PCI_ANY_ID, | 686 | .subvendor = PCI_ANY_ID, |
| 687 | .subdevice = PCI_ANY_ID, | 687 | .subdevice = PCI_ANY_ID, |
| 688 | }, | 688 | }, |
| 689 | /* SIS 760 */ | ||
| 690 | { | ||
| 691 | .class = (PCI_CLASS_BRIDGE_HOST << 8), | ||
| 692 | .class_mask = ~0, | ||
| 693 | .vendor = PCI_VENDOR_ID_SI, | ||
| 694 | .device = PCI_DEVICE_ID_SI_760, | ||
| 695 | .subvendor = PCI_ANY_ID, | ||
| 696 | .subdevice = PCI_ANY_ID, | ||
| 697 | }, | ||
| 689 | { } | 698 | { } |
| 690 | }; | 699 | }; |
| 691 | 700 | ||