X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fchar%2Frio%2Frio_linux.h;h=4ce77fb1fae5f9befb1e9a794de4c422e1a25f66;hb=9464c7cf61b9433057924c36e6e02f303a00e768;hp=dc3f005614a36d5cefbc9df333a1fa09aab8546a;hpb=41689045f6a3cbe0550e1d34e9cc20d2e8c432ba;p=linux-2.6.git

diff --git a/drivers/char/rio/rio_linux.h b/drivers/char/rio/rio_linux.h
index dc3f00561..4ce77fb1f 100644
--- a/drivers/char/rio/rio_linux.h
+++ b/drivers/char/rio/rio_linux.h
@@ -23,6 +23,7 @@
  *  Version 1.0 -- July, 1999. 
  * 
  */
+#include <linux/config.h>
 
 #define RIO_NBOARDS        4
 #define RIO_PORTSPERBOARD 128
@@ -130,9 +131,9 @@ struct vpd_prom {
 
 
 #ifdef CONFIG_RIO_OLDPCI
-static inline void __iomem *rio_memcpy_toio(void __iomem *dummy, void __iomem *dest, void *source, int n)
+static inline void *rio_memcpy_toio(void *dummy, void *dest, void *source, int n)
 {
-	char __iomem *dst = dest;
+	char *dst = dest;
 	char *src = source;
 
 	while (n--) {
@@ -143,22 +144,11 @@ static inline void __iomem *rio_memcpy_toio(void __iomem *dummy, void __iomem *d
 	return dest;
 }
 
-static inline void __iomem *rio_copy_toio(void __iomem *dest, void *source, int n)
-{
-	char __iomem *dst = dest;
-	char *src = source;
-
-	while (n--)
-		writeb(*src++, dst++);
 
-	return dest;
-}
-
-
-static inline void *rio_memcpy_fromio(void *dest, void __iomem *source, int n)
+static inline void *rio_memcpy_fromio(void *dest, void *source, int n)
 {
 	char *dst = dest;
-	char __iomem *src = source;
+	char *src = source;
 
 	while (n--)
 		*dst++ = readb(src++);
@@ -168,7 +158,6 @@ static inline void *rio_memcpy_fromio(void *dest, void __iomem *source, int n)
 
 #else
 #define rio_memcpy_toio(dummy,dest,source,n)   memcpy_toio(dest, source, n)
-#define rio_copy_toio   		       memcpy_toio
 #define rio_memcpy_fromio                      memcpy_fromio
 #endif