Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1

[linux-2.6.git] / drivers / char / agp / via-agp.c

diff --git a/drivers/char/agp/via-agp.c b/drivers/char/agp/via-agp.c
index c149ac9..2ded7a2 100644 (file)
--- a/drivers/char/agp/via-agp.c
+++ b/drivers/char/agp/via-agp.c
@@ -380,9 +380,23 @@ static struct agp_device_ids via_agp_device_ids[] __devinitdata =
        /* P4M800CE */
        {
                .device_id      = PCI_DEVICE_ID_VIA_P4M800CE,
-               .chipset_name   = "P4M800CE",
+               .chipset_name   = "VT3314",
+       },
+       /* CX700 */
+       {
+               .device_id  = PCI_DEVICE_ID_VIA_CX700,
+               .chipset_name   = "CX700",
+       },
+       /* VT3336 */
+       {
+               .device_id  = PCI_DEVICE_ID_VIA_VT3336,
+               .chipset_name   = "VT3336",
+       },
+       /* P4M890 */
+       {
+               .device_id  = PCI_DEVICE_ID_VIA_P4M890,
+               .chipset_name   = "P4M890",
        },
-
        { }, /* dummy final entry, always present */
 };
 
@@ -524,6 +538,9 @@ 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_VT3336),
+       ID(PCI_DEVICE_ID_VIA_P4M890),
        { }
 };