diff options
Diffstat (limited to 'drivers/char/rio/rio_linux.h')
-rw-r--r-- | drivers/char/rio/rio_linux.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/char/rio/rio_linux.h b/drivers/char/rio/rio_linux.h index 4ce77fb1fae5..99c7447b6113 100644 --- a/drivers/char/rio/rio_linux.h +++ b/drivers/char/rio/rio_linux.h | |||
@@ -131,24 +131,24 @@ struct vpd_prom { | |||
131 | 131 | ||
132 | 132 | ||
133 | #ifdef CONFIG_RIO_OLDPCI | 133 | #ifdef CONFIG_RIO_OLDPCI |
134 | static inline void *rio_memcpy_toio(void *dummy, void *dest, void *source, int n) | 134 | static inline void __iomem *rio_memcpy_toio(void __iomem *dummy, void __iomem *dest, void *source, int n) |
135 | { | 135 | { |
136 | char *dst = dest; | 136 | char __iomem *dst = dest; |
137 | char *src = source; | 137 | char *src = source; |
138 | 138 | ||
139 | while (n--) { | 139 | while (n--) { |
140 | writeb(*src++, dst++); | 140 | writeb(*src++, dst++); |
141 | (void) readb(dummy); | 141 | (void) readb(dummy); /* WTF? */ |
142 | } | 142 | } |
143 | 143 | ||
144 | return dest; | 144 | return dest; |
145 | } | 145 | } |
146 | 146 | ||
147 | 147 | ||
148 | static inline void *rio_memcpy_fromio(void *dest, void *source, int n) | 148 | static inline void *rio_memcpy_fromio(void *dest, void __iomem *source, int n) |
149 | { | 149 | { |
150 | char *dst = dest; | 150 | char *dst = dest; |
151 | char *src = source; | 151 | char __iomem *src = source; |
152 | 152 | ||
153 | while (n--) | 153 | while (n--) |
154 | *dst++ = readb(src++); | 154 | *dst++ = readb(src++); |