aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-15 15:10:26 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-15 15:10:26 -0400
commit0560551dca0c02a4b23f95a9c339882ff291e1c7 (patch)
treeaf0fa695a2149b5632d91bd28620de10a0dcf2fa
parent1ca9bc4f2ae22741f2a545c1b0c3a042a2d71b11 (diff)
parentbbdfff86a8f0c91ad8b6dedf74bc14de4ba39679 (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
-rw-r--r--drivers/char/agp/via-agp.c6
-rw-r--r--include/linux/pci_ids.h1
2 files changed, 4 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 { }
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index ccd85e4d3b8f..3b1fbf49fa7d 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1288,6 +1288,7 @@
1288#define PCI_DEVICE_ID_VIA_8363_0 0x0305 1288#define PCI_DEVICE_ID_VIA_8363_0 0x0305
1289#define PCI_DEVICE_ID_VIA_P4M800CE 0x0314 1289#define PCI_DEVICE_ID_VIA_P4M800CE 0x0314
1290#define PCI_DEVICE_ID_VIA_P4M890 0x0327 1290#define PCI_DEVICE_ID_VIA_P4M890 0x0327
1291#define PCI_DEVICE_ID_VIA_VT3324 0x0324
1291#define PCI_DEVICE_ID_VIA_VT3336 0x0336 1292#define PCI_DEVICE_ID_VIA_VT3336 0x0336
1292#define PCI_DEVICE_ID_VIA_8371_0 0x0391 1293#define PCI_DEVICE_ID_VIA_8371_0 0x0391
1293#define PCI_DEVICE_ID_VIA_8501_0 0x0501 1294#define PCI_DEVICE_ID_VIA_8501_0 0x0501