From 86f3180bd20c2bf4c25e76308da30018f17d5782 Mon Sep 17 00:00:00 2001
From: Deepak Saxena <dsaxena@plexity.net>
Date: Fri, 28 Oct 2005 15:19:05 +0100
Subject: [PATCH] --- yaml --- r: 10431 b: refs/heads/master c:
 d157e9ecec59383a676d676e2bb39367430396a2 h: refs/heads/master i:   10429:
 65e9a11e26075223e5fca03941519c6b1814e492   10427:
 f68d97713a5f1abd73e53bc485928d8900897979   10423:
 fd46c384d81e5fc7f67153b8fe74188d6ce4ca38   10415:
 f4375bb85022117d4c147e3fd840f2589921fb1c   10399:
 7ab377bf79eaa999cb3e6633e84e6a9893d55c8f   10367:
 1248fc43d8097c903ea32169b3aabda213e88d9f v: v3

---
 [refs]                              |  2 +-
 trunk/arch/arm/mach-clps7500/core.c | 25 +++++++++++++++++++++----
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 3db23eb4aa82..c67f8c071759 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f10083f5a6f4a2735cca3a8c762457272ea66bf0
+refs/heads/master: d157e9ecec59383a676d676e2bb39367430396a2
diff --git a/trunk/arch/arm/mach-clps7500/core.c b/trunk/arch/arm/mach-clps7500/core.c
index e216ab8b9e8f..0364ba4b539e 100644
--- a/trunk/arch/arm/mach-clps7500/core.c
+++ b/trunk/arch/arm/mach-clps7500/core.c
@@ -259,10 +259,27 @@ static void __init clps7500_init_irq(void)
 }
 
 static struct map_desc cl7500_io_desc[] __initdata = {
-	{ IO_BASE,	IO_START,	IO_SIZE,    MT_DEVICE },	/* IO space	*/
-	{ ISA_BASE,	ISA_START,	ISA_SIZE,   MT_DEVICE },	/* ISA space	*/
-	{ FLASH_BASE,	FLASH_START,	FLASH_SIZE, MT_DEVICE },	/* Flash	*/
-	{ LED_BASE,	LED_START,	LED_SIZE,   MT_DEVICE } 	/* LED		*/
+	{ 	/* IO space	*/
+		.virtual	= IO_BASE,
+		.pfn		= __phys_to_pfn(IO_START),
+		.length		= IO_SIZE,
+		.type		= MT_DEVICE
+	}, {	/* ISA space	*/
+		.virtual	= ISA_BASE,
+		.pfn		= __phys_to_pfn(ISA_START),
+		.length		= ISA_SIZE,
+		.type		= MT_DEVICE
+	}, {	/* Flash	*/
+		.virtual	= FLASH_BASE,
+		.pfn		= __phys_to_pfn(FLASH_START),
+		.length		= FLASH_SIZE,
+		.type		= MT_DEVICE
+	}, {	/* LED		*/
+		.virtual	= LED_BASE,
+		.pfn		= __phys_to_pfn(LED_START),
+		.length		= LED_SIZE,
+		.type		= MT_DEVICE
+	}
 };
 
 static void __init clps7500_map_io(void)