Merge branch 'iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip...

[linux-2.6-omap-h63xx.git] / arch / sh / lib / io.c

diff --git a/arch/sh/lib/io.c b/arch/sh/lib/io.c
index 4f54ec43516f297296605d57ba20dbca65345f44..88dfe6e396bc44a67e557534e8bcb86b94b43e63 100644 (file)
--- a/arch/sh/lib/io.c
+++ b/arch/sh/lib/io.c
@@ -14,12 +14,12 @@
 #include <linux/module.h>
 #include <linux/io.h>
 
-void __raw_readsl(unsigned long addr, void *datap, int len)
+void __raw_readsl(const void __iomem *addr, void *datap, int len)
 {
        u32 *data;
 
        for (data = datap; (len != 0) && (((u32)data & 0x1f) != 0); len--)
-               *data++ = ctrl_inl(addr);
+               *data++ = __raw_readl(addr);
 
        if (likely(len >= (0x20 >> 2))) {
                int tmp2, tmp3, tmp4, tmp5, tmp6;
@@ -59,11 +59,11 @@ void __raw_readsl(unsigned long addr, void *datap, int len)
        }
 
        for (; len != 0; len--)
-               *data++ = ctrl_inl(addr);
+               *data++ = __raw_readl(addr);
 }
 EXPORT_SYMBOL(__raw_readsl);
 
-void __raw_writesl(unsigned long addr, const void *data, int len)
+void __raw_writesl(void __iomem *addr, const void *data, int len)
 {
        if (likely(len != 0)) {
                int tmp1;