diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-15 15:10:26 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-15 15:10:26 -0400 |
| commit | 0560551dca0c02a4b23f95a9c339882ff291e1c7 (patch) | |
| tree | af0fa695a2149b5632d91bd28620de10a0dcf2fa /drivers/char | |
| parent | 1ca9bc4f2ae22741f2a545c1b0c3a042a2d71b11 (diff) | |
| parent | bbdfff86a8f0c91ad8b6dedf74bc14de4ba39679 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
* master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart:
[AGPGART] Fix wrong ID in via-agp.c
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/agp/via-agp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/char/agp/via-agp.c b/drivers/char/agp/via-agp.c index a2bb4eccaab4..9aaf401a8975 100644 --- a/drivers/char/agp/via-agp.c +++ b/drivers/char/agp/via-agp.c | |||
| @@ -384,9 +384,9 @@ static struct agp_device_ids via_agp_device_ids[] __devinitdata = | |||
| 384 | .device_id = PCI_DEVICE_ID_VIA_P4M800CE, | 384 | .device_id = PCI_DEVICE_ID_VIA_P4M800CE, |
| 385 | .chipset_name = "VT3314", | 385 | .chipset_name = "VT3314", |
| 386 | }, | 386 | }, |
| 387 | /* CX700 */ | 387 | /* VT3324 / CX700 */ |
| 388 | { | 388 | { |
| 389 | .device_id = PCI_DEVICE_ID_VIA_CX700, | 389 | .device_id = PCI_DEVICE_ID_VIA_VT3324, |
| 390 | .chipset_name = "CX700", | 390 | .chipset_name = "CX700", |
| 391 | }, | 391 | }, |
| 392 | /* VT3336 */ | 392 | /* VT3336 */ |
| @@ -540,7 +540,7 @@ static const struct pci_device_id agp_via_pci_table[] = { | |||
| 540 | ID(PCI_DEVICE_ID_VIA_83_87XX_1), | 540 | ID(PCI_DEVICE_ID_VIA_83_87XX_1), |
| 541 | ID(PCI_DEVICE_ID_VIA_3296_0), | 541 | ID(PCI_DEVICE_ID_VIA_3296_0), |
| 542 | ID(PCI_DEVICE_ID_VIA_P4M800CE), | 542 | ID(PCI_DEVICE_ID_VIA_P4M800CE), |
| 543 | ID(PCI_DEVICE_ID_VIA_CX700), | 543 | ID(PCI_DEVICE_ID_VIA_VT3324), |
| 544 | ID(PCI_DEVICE_ID_VIA_VT3336), | 544 | ID(PCI_DEVICE_ID_VIA_VT3336), |
| 545 | ID(PCI_DEVICE_ID_VIA_P4M890), | 545 | ID(PCI_DEVICE_ID_VIA_P4M890), |
| 546 | { } | 546 | { } |