Merge to Fedora kernel-2.6.6-1.422

[linux-2.6.git] / arch / x86_64 / lib / io.c

diff --git a/arch/x86_64/lib/io.c b/arch/x86_64/lib/io.c
index 5950b82..ca08e31 100644 (file)
--- a/arch/x86_64/lib/io.c
+++ b/arch/x86_64/lib/io.c
@@ -2,14 +2,12 @@
 #include <asm/io.h>
 #include <linux/module.h>
 
-void *__memcpy_toio(unsigned long dst,const void*src,unsigned len)
+void *memcpy_toio(void *dst,const void*src,unsigned len)
 {
-       return __inline_memcpy((void *) dst,src,len);
+       return __inline_memcpy(dst,src,len);
 }
-EXPORT_SYMBOL(__memcpy_toio);
 
-void *__memcpy_fromio(void *dst,unsigned long src,unsigned len)
+void *memcpy_fromio(void *dst,const void*src,unsigned len)
 {
-       return __inline_memcpy(dst,(const void *) src,len);
+       return __inline_memcpy(dst,src,len);
 }
-EXPORT_SYMBOL(__memcpy_fromio);