From 941f13ad69440e7ca0d1668b4086e918cd00756a Mon Sep 17 00:00:00 2001
From: Aaro Koskinen <aaro.koskinen@nokia.com>
Date: Thu, 18 Nov 2010 19:59:50 +0200
Subject: [PATCH] --- yaml --- r: 226432 b: refs/heads/master c:
 7489ffcea62e0b990d3557746d19a47e83e07042 h: refs/heads/master v: v3

---
 [refs]                                      | 2 +-
 trunk/arch/arm/mach-omap1/board-ams-delta.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 48c3c063b1a5..145958476a06 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 87aedfe25a754a3ab49a7cfdb8f81bc882bc34fa
+refs/heads/master: 7489ffcea62e0b990d3557746d19a47e83e07042
diff --git a/trunk/arch/arm/mach-omap1/board-ams-delta.c b/trunk/arch/arm/mach-omap1/board-ams-delta.c
index 1d4163b9f0b7..1948cd3ee500 100644
--- a/trunk/arch/arm/mach-omap1/board-ams-delta.c
+++ b/trunk/arch/arm/mach-omap1/board-ams-delta.c
@@ -28,6 +28,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
+#include <plat/io.h>
 #include <plat/board-ams-delta.h>
 #include <mach/gpio.h>
 #include <plat/keypad.h>
@@ -316,7 +317,7 @@ static void __init ams_delta_init(void)
 
 static struct plat_serial8250_port ams_delta_modem_ports[] = {
 	{
-		.membase	= (void *) AMS_DELTA_MODEM_VIRT,
+		.membase	= IOMEM(AMS_DELTA_MODEM_VIRT),
 		.mapbase	= AMS_DELTA_MODEM_PHYS,
 		.irq		= -EINVAL, /* changed later */
 		.flags		= UPF_BOOT_AUTOCONF,