diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-15 12:10:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-15 12:10:26 -0700 |
| commit | 0560551dca0c02a4b23f95a9c339882ff291e1c7 (patch) | |
| tree | af0fa695a2149b5632d91bd28620de10a0dcf2fa | |
| parent | 1ca9bc4f2ae22741f2a545c1b0c3a042a2d71b11 (diff) | |
| parent | bbdfff86a8f0c91ad8b6dedf74bc14de4ba39679 (diff) | |
| download | linux-2.6-klibc-0560551dca0c02a4b23f95a9c339882ff291e1c7.tar.gz | |
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.c | 6 | ||||
| -rw-r--r-- | include/linux/pci_ids.h | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/drivers/char/agp/via-agp.c b/drivers/char/agp/via-agp.c index a2bb4eccaab4c0..9aaf401a8975aa 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 = .device_id = PCI_DEVICE_ID_VIA_P4M800CE, .chipset_name = "VT3314", }, - /* CX700 */ + /* VT3324 / CX700 */ { - .device_id = PCI_DEVICE_ID_VIA_CX700, + .device_id = PCI_DEVICE_ID_VIA_VT3324, .chipset_name = "CX700", }, /* VT3336 */ @@ -540,7 +540,7 @@ static const struct pci_device_id agp_via_pci_table[] = { ID(PCI_DEVICE_ID_VIA_83_87XX_1), ID(PCI_DEVICE_ID_VIA_3296_0), ID(PCI_DEVICE_ID_VIA_P4M800CE), - ID(PCI_DEVICE_ID_VIA_CX700), + ID(PCI_DEVICE_ID_VIA_VT3324), ID(PCI_DEVICE_ID_VIA_VT3336), ID(PCI_DEVICE_ID_VIA_P4M890), { } diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index ccd85e4d3b8fe0..3b1fbf49fa7d07 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -1288,6 +1288,7 @@ #define PCI_DEVICE_ID_VIA_8363_0 0x0305 #define PCI_DEVICE_ID_VIA_P4M800CE 0x0314 #define PCI_DEVICE_ID_VIA_P4M890 0x0327 +#define PCI_DEVICE_ID_VIA_VT3324 0x0324 #define PCI_DEVICE_ID_VIA_VT3336 0x0336 #define PCI_DEVICE_ID_VIA_8371_0 0x0391 #define PCI_DEVICE_ID_VIA_8501_0 0x0501 |