3 files changed, 11 insertions, 1 deletions

diff --git a/drivers/char/agp/Kconfig b/drivers/char/agp/Kconfig
index 0b9cf9c59a21..7c88c060a9e6 100644
--- a/drivers/char/agp/Kconfig
+++ b/drivers/char/agp/Kconfig
@@ -86,7 +86,7 @@ config AGP_NVIDIA
 
 config AGP_SIS
         tristate "SiS chipset support"
-        depends on AGP && X86_32
+        depends on AGP
         help
           This option gives you AGP support for the GLX component of
           X on Silicon Integrated Systems [SiS] chipsets.
diff --git a/drivers/char/agp/amd64-agp.c b/drivers/char/agp/amd64-agp.c
index 36517d4d1ad9..ac3c33a2e37d 100644
--- a/drivers/char/agp/amd64-agp.c
+++ b/drivers/char/agp/amd64-agp.c
@@ -617,6 +617,9 @@ static int agp_amd64_resume(struct pci_dev *pdev)
         pci_set_power_state(pdev, PCI_D0);
         pci_restore_state(pdev);
 
+        if (pdev->vendor == PCI_VENDOR_ID_NVIDIA)
+                nforce3_agp_init(pdev);
+
         return amd_8151_configure();
 }
 
diff --git a/drivers/char/agp/via-agp.c b/drivers/char/agp/via-agp.c
index 97b0a890ba7f..b8ec25d17478 100644
--- a/drivers/char/agp/via-agp.c
+++ b/drivers/char/agp/via-agp.c
@@ -345,6 +345,12 @@ static struct agp_device_ids via_agp_device_ids[] __devinitdata =
                 .chipset_name   = "PT880",
         },
 
+        /* PT880 Ultra */
+        {
+                .device_id      = PCI_DEVICE_ID_VIA_PT880ULTRA,
+                .chipset_name   = "PT880 Ultra",
+        },
+
         /* PT890 */
         {
                 .device_id      = PCI_DEVICE_ID_VIA_8783_0,
@@ -511,6 +517,7 @@ static struct pci_device_id agp_via_pci_table[] = {
         ID(PCI_DEVICE_ID_VIA_8763_0),
         ID(PCI_DEVICE_ID_VIA_8378_0),
         ID(PCI_DEVICE_ID_VIA_PT880),
+        ID(PCI_DEVICE_ID_VIA_PT880ULTRA),
         ID(PCI_DEVICE_ID_VIA_8783_0),
         ID(PCI_DEVICE_ID_VIA_PX8X0_0),
         ID(PCI_DEVICE_ID_VIA_3269_0),