Index: include/memstr.h
===================================================================
--- include/memstr.h	(revision e1587177838ccb47b7357d72843335806e36fa18)
+++ include/memstr.h	(revision 104dc0b57379eb9a5c6034b0a00f473408a9c5cd)
@@ -32,6 +32,5 @@
 #include <typedefs.h>
 #include <arch/types.h>
-
-#define memcpy(dst, src, cnt)	__builtin_memcpy((dst), (src), (cnt)); 
+#include <arch/asm.h>
 
 extern void memsetw(__address dst, size_t cnt, __u16 x);