Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds

[linux-2.6-omap-h63xx.git] / drivers / char / rio / rio_linux.h

diff --git a/drivers/char/rio/rio_linux.h b/drivers/char/rio/rio_linux.h
index 99c7447b6113100da43eae67351a1d659096a11b..dc3f005614a36d5cefbc9df333a1fa09aab8546a 100644 (file)
--- a/drivers/char/rio/rio_linux.h
+++ b/drivers/char/rio/rio_linux.h
@@ -23,7 +23,6 @@
  *  Version 1.0 -- July, 1999. 
  * 
  */
-#include <linux/config.h>
 
 #define RIO_NBOARDS        4
 #define RIO_PORTSPERBOARD 128
@@ -138,12 +137,23 @@ static inline void __iomem *rio_memcpy_toio(void __iomem *dummy, void __iomem *d
 
        while (n--) {
                writeb(*src++, dst++);
-               (void) readb(dummy);    /* WTF? */
+               (void) readb(dummy);
        }
 
        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)
 {
@@ -158,6 +168,7 @@ 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