add HAVE_CLK to Kconfig, for driver dependencies

[sfrench/cifs-2.6.git] / arch / sh / kernel / io.c

diff --git a/arch/sh/kernel/io.c b/arch/sh/kernel/io.c
index 71c9fde2fd9072517af4062168d720c2c3153b57..2b8991229900cbaf96a1f595ebb0fc91a484d00d 100644 (file)
--- 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);