From e69de1be9bf0c4f842389fb783fd234e14aaf3aa Mon Sep 17 00:00:00 2001
From: Dave Jones <davej@redhat.com>
Date: Sun, 21 May 2006 17:11:42 -0400
Subject: [PATCH] --- yaml --- r: 27026 b: refs/heads/master c:
 ca2797ffaabc1f73cf8a73a30f709f0c1a6bef34 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/char/agp/amd64-agp.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 93d09ac3762e..f90b5bc4592a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 283a12c53b9abeed89491da4a1eda98f5764947b
+refs/heads/master: ca2797ffaabc1f73cf8a73a30f709f0c1a6bef34
diff --git a/trunk/drivers/char/agp/amd64-agp.c b/trunk/drivers/char/agp/amd64-agp.c
index 36517d4d1ad9..ac3c33a2e37d 100644
--- a/trunk/drivers/char/agp/amd64-agp.c
+++ b/trunk/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();
 }