Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild

[~andy/linux] / drivers / char / agp / via-agp.c

diff --git a/drivers/char/agp/via-agp.c b/drivers/char/agp/via-agp.c
index a2bb4eccaab4c08fbbf24049ee1a7b1d5d64cf4e..0ecc54d327bcd6403be30452027d57ba3a9f0250 100644 (file)
--- 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 */
@@ -399,6 +399,11 @@ static struct agp_device_ids via_agp_device_ids[] __devinitdata =
                .device_id  = PCI_DEVICE_ID_VIA_P4M890,
                .chipset_name   = "P4M890",
        },
+       /* P4M900 */
+       {
+               .device_id  = PCI_DEVICE_ID_VIA_VT3364,
+               .chipset_name   = "P4M900",
+       },
        { }, /* dummy final entry, always present */
 };
 
@@ -540,7 +545,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),
        { }