From 250d541316327ad7c836da6cb881533401644e38 Mon Sep 17 00:00:00 2001
From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Sun, 13 Nov 2005 09:53:34 +0000
Subject: [PATCH] --- yaml --- r: 14141 b: refs/heads/master c:
 865052fd51a4f95a9c61961198695877ddc3dc9e h: refs/heads/master i:   14139:
 ebaac41dc6a2c26a452e3896b2bcbacc916972ee v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/arm/mach-footbridge/common.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 6179e2936dfc..d51d4078f3fd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1cf99be560e471a868e14b12c08b0ae383966cec
+refs/heads/master: 865052fd51a4f95a9c61961198695877ddc3dc9e
diff --git a/trunk/arch/arm/mach-footbridge/common.c b/trunk/arch/arm/mach-footbridge/common.c
index fd60225a0a46..bbe6e4a0bf6a 100644
--- a/trunk/arch/arm/mach-footbridge/common.c
+++ b/trunk/arch/arm/mach-footbridge/common.c
@@ -132,7 +132,7 @@ void __init footbridge_init_irq(void)
 static struct map_desc fb_common_io_desc[] __initdata = {
 	{
 		.virtual	= ARMCSR_BASE,
-		.pfn		= __phy_to_pfn(DC21285_ARMCSR_BASE),
+		.pfn		= __phys_to_pfn(DC21285_ARMCSR_BASE),
 		.length		= ARMCSR_SIZE,
 		.type		= MT_DEVICE,
 	}, {