From 1a7ce0b17243d307a7e1c64257606634d3e31625 Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Wed, 17 Dec 2008 12:42:20 +0900
Subject: [PATCH] --- yaml --- r: 120141 b: refs/heads/master c:
 98a955da8525a4218c8186fba5a6b949f563bbea h: refs/heads/master i:   120139:
 b6dcaa5220061848d72059640f554e7c1fd01c86 v: v3

---
 [refs]                             |  2 +-
 trunk/arch/sh/boards/board-shmin.c | 14 +++-----------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 6c98e3c3ed25..0d34921bf360 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2125a46083dc5a9aa321c243e322638a9338cd11
+refs/heads/master: 98a955da8525a4218c8186fba5a6b949f563bbea
diff --git a/trunk/arch/sh/boards/board-shmin.c b/trunk/arch/sh/boards/board-shmin.c
index 5cc0867de5ab..b1dcbbc89188 100644
--- a/trunk/arch/sh/boards/board-shmin.c
+++ b/trunk/arch/sh/boards/board-shmin.c
@@ -22,21 +22,13 @@ static void __init init_shmin_irq(void)
 	plat_irq_setup_pins(IRQ_MODE_IRQ);
 }
 
-static void __iomem *shmin_ioport_map(unsigned long port, unsigned int size)
+static void __init shmin_setup(char **cmdline_p)
 {
-	static int dummy;
-
-	if ((port & ~0x1f) == SHMIN_NE_BASE)
-		return (void __iomem *)(SHMIN_IO_BASE + port);
-
-	dummy = 0;
-
-	return &dummy;
-
+	__set_io_port_base(SHMIN_IO_BASE);
 }
 
 static struct sh_machine_vector mv_shmin __initmv = {
 	.mv_name	= "SHMIN",
+	.mv_setup	= shmin_setup,
 	.mv_init_irq	= init_shmin_irq,
-	.mv_ioport_map	= shmin_ioport_map,
 };