From a33db2807a4105d427516e6c42b96b76108e6433 Mon Sep 17 00:00:00 2001
From: David Woodhouse <dwmw2@infradead.org>
Date: Thu, 6 Aug 2009 20:20:43 +1000
Subject: [PATCH] --- yaml --- r: 161376 b: refs/heads/master c:
 5e8d6b8bf94f1ffcb7e3c31b73284c20f297f191 h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/char/agp/uninorth-agp.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index faea9d644449..a0fee7cc7a5a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 94aa9b9ab09922cfd3bf52806f3ede9cde1ce300
+refs/heads/master: 5e8d6b8bf94f1ffcb7e3c31b73284c20f297f191
diff --git a/trunk/drivers/char/agp/uninorth-agp.c b/trunk/drivers/char/agp/uninorth-agp.c
index 2e993112ab88..4317a5588daf 100644
--- a/trunk/drivers/char/agp/uninorth-agp.c
+++ b/trunk/drivers/char/agp/uninorth-agp.c
@@ -135,7 +135,7 @@ static int uninorth_configure(void)
 	if (is_u3) {
 		pci_write_config_dword(agp_bridge->dev,
 				       UNI_N_CFG_GART_DUMMY_PAGE,
-				       agp_bridge->scratch_page_real >> 12);
+				       page_to_phys(agp_bridge->scratch_page_page) >> 12);
 	}
 
 	return 0;