diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-01-31 12:24:00 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-01-31 12:24:00 -0500 |
| commit | 30716e07ef511ec7525c07eb1e8060ba8943c2a2 (patch) | |
| tree | eb6a47cae63d3587fa773cc5a16781eaa2c7810b /drivers/char/agp/amd64-agp.c | |
| parent | 03c79cc56e4497cbd09d74a73c1bd0d1d9a8a16c (diff) | |
| parent | f56df2f4db6e4af87fb8e941cff69f4501a111df (diff) | |
Merge branch 'linus'
Diffstat (limited to 'drivers/char/agp/amd64-agp.c')
| -rw-r--r-- | drivers/char/agp/amd64-agp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/agp/amd64-agp.c b/drivers/char/agp/amd64-agp.c index 979300405c0e..93d2209fee4c 100644 --- a/drivers/char/agp/amd64-agp.c +++ b/drivers/char/agp/amd64-agp.c | |||
| @@ -655,7 +655,7 @@ static struct pci_device_id agp_amd64_pci_table[] = { | |||
| 655 | .class = (PCI_CLASS_BRIDGE_HOST << 8), | 655 | .class = (PCI_CLASS_BRIDGE_HOST << 8), |
| 656 | .class_mask = ~0, | 656 | .class_mask = ~0, |
| 657 | .vendor = PCI_VENDOR_ID_VIA, | 657 | .vendor = PCI_VENDOR_ID_VIA, |
| 658 | .device = PCI_DEVICE_ID_VIA_K8M890CE, | 658 | .device = PCI_DEVICE_ID_VIA_VT3336, |
| 659 | .subvendor = PCI_ANY_ID, | 659 | .subvendor = PCI_ANY_ID, |
| 660 | .subdevice = PCI_ANY_ID, | 660 | .subdevice = PCI_ANY_ID, |
| 661 | }, | 661 | }, |