vserver 2.0 rc7

[linux-2.6.git] / include / asm-arm / arch-rpc / io.h

diff --git a/include/asm-arm/arch-rpc/io.h b/include/asm-arm/arch-rpc/io.h
index f53c72c..24453c4 100644 (file)
--- a/include/asm-arm/arch-rpc/io.h
+++ b/include/asm-arm/arch-rpc/io.h
@@ -128,9 +128,9 @@ static inline void __iomem *__ioaddr(unsigned int port)
 {
        void __iomem *ret;
        if (__PORT_PCIO(port))
-               ret = (void __iomem *)PCIO_BASE;
+               ret = PCIO_BASE;
        else
-               ret = (void __iomem *)IO_BASE;
+               ret = IO_BASE;
        return ret + (port << 2);
 }
 
@@ -230,8 +230,8 @@ DECLARE_IO(int,l,"")
        result;                                                                 \
 })
 
-#define __ioaddrc(port)                                                                \
-       ((void __iomem *)(__PORT_PCIO((port)) ? PCIO_BASE : IO_BASE) + ((port) << 2))
+#define __ioaddrc(port)                \
+       ((__PORT_PCIO(port) ? PCIO_BASE : IO_BASE) + ((port) << 2))
 
 #define inb(p)         (__builtin_constant_p((p)) ? __inbc(p)    : __inb(p))
 #define inw(p)         (__builtin_constant_p((p)) ? __inwc(p)    : __inw(p))