-#ifdef __WANT_IO_DEF
-
-#define __inb(p) t2_inb((unsigned long)(p))
-#define __inw(p) t2_inw((unsigned long)(p))
-#define __inl(p) t2_inl((unsigned long)(p))
-#define __outb(x,p) t2_outb((x),(unsigned long)(p))
-#define __outw(x,p) t2_outw((x),(unsigned long)(p))
-#define __outl(x,p) t2_outl((x),(unsigned long)(p))
-#define __readb(a) t2_readb((unsigned long)(a))
-#define __readw(a) t2_readw((unsigned long)(a))
-#define __readl(a) t2_readl((unsigned long)(a))
-#define __readq(a) t2_readq((unsigned long)(a))
-#define __writeb(x,a) t2_writeb((x),(unsigned long)(a))
-#define __writew(x,a) t2_writew((x),(unsigned long)(a))
-#define __writel(x,a) t2_writel((x),(unsigned long)(a))
-#define __writeq(x,a) t2_writeq((x),(unsigned long)(a))
-#define __ioremap(a,s) t2_ioremap((unsigned long)(a),(s))
-#define __iounmap(a) t2_iounmap((unsigned long)(a))
-#define __is_ioaddr(a) t2_is_ioaddr((unsigned long)(a))
-
-#endif /* __WANT_IO_DEF */
+#undef __IO_PREFIX
+#define __IO_PREFIX t2
+#define t2_trivial_rw_bw 0
+#define t2_trivial_rw_lq 0
+#define t2_trivial_io_bw 0
+#define t2_trivial_io_lq 0
+#define t2_trivial_iounmap 1
+#include <asm/io_trivial.h>