upgrade to linux 2.6.10-1.12_FC2

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

diff --git a/drivers/char/agp/ali-agp.c b/drivers/char/agp/ali-agp.c
index a82c2f9..19836be 100644 (file)
--- a/drivers/char/agp/ali-agp.c
+++ b/drivers/char/agp/ali-agp.c
@@ -285,6 +285,15 @@ static struct agp_device_ids ali_agp_device_ids[] __devinitdata =
                .device_id      = PCI_DEVICE_ID_AL_M1683,
                .chipset_name   = "M1683",
        },
+       {
+               .device_id      = PCI_DEVICE_ID_AL_M1681,
+               .chipset_name   = "M1681",
+       },
+       {
+               .device_id      = PCI_DEVICE_ID_AL_M1683,
+               .chipset_name   = "M1683",
+       },
+
        { }, /* dummy final entry, always present */
 };
 
@@ -395,6 +404,8 @@ static struct pci_driver agp_ali_pci_driver = {
 
 static int __init agp_ali_init(void)
 {
+       if (agp_off)
+               return -EINVAL;
        return pci_module_init(&agp_ali_pci_driver);
 }