Index: src/via_memcpy.c
===================================================================
--- src/via_memcpy.c	(revision 508)
+++ src/via_memcpy.c	(working copy)
@@ -329,7 +329,7 @@
     if ( yuv422 ) w <<= 1;
     if (dstPitch == w) {
 	int size = h*((yuv422) ? w : (w + (w >> 1)));
-	xf86memcpy(dst, src, size);
+	memcpy(dst, src, size);
 	return;
     } else {
 	int count;
@@ -338,7 +338,7 @@
 
 	count = h;
 	while(count--) {
-	    xf86memcpy(dst, src, w);
+	    memcpy(dst, src, w);
 	    src += w;
 	    dst += dstPitch;
 	}
@@ -354,7 +354,7 @@
 
 	    count = h;
 	    while(count--) {
-		xf86memcpy(dst, src, w);
+		memcpy(dst, src, w);
 		src += w;
 		dst += dstPitch;
 	    }