X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=arch%2Fsh%2Fkernel%2Fio.c;h=2b8991229900cbaf96a1f595ebb0fc91a484d00d;hb=6f74b1849bf04432c4a2fe21f594136e5b9d1fad;hp=71c9fde2fd9072517af4062168d720c2c3153b57;hpb=b66c1a3919abb40f9bd8fb92a0d9fd77eb899c54;p=linux-2.6-omap-h63xx.git

diff --git a/arch/sh/kernel/io.c b/arch/sh/kernel/io.c
index 71c9fde2fd9..2b899122990 100644
--- a/arch/sh/kernel/io.c
+++ b/arch/sh/kernel/io.c
@@ -63,7 +63,13 @@ EXPORT_SYMBOL(memset_io);
 
 void __iomem *ioport_map(unsigned long port, unsigned int nr)
 {
-	return sh_mv.mv_ioport_map(port, nr);
+	void __iomem *ret;
+
+	ret = __ioport_map_trapped(port, nr);
+	if (ret)
+		return ret;
+
+	return __ioport_map(port, nr);
 }
 EXPORT_SYMBOL(ioport_map);