xserver: Branch 'master'

[Søren Sandmann Pedersen]

 fb/fbmmx.c |   24 ------------------------
 fb/fbmmx.h |   12 ------------
 2 files changed, 36 deletions(-)

New commits:
diff-tree 567b5bf765254a4ae9cc7711bb6acfa89a9fd61c (from 49ed31c0b323dd8c5887a803c199875e6f2330d8)
Author: Søren Sandmann Pedersen <sandmann at redhat.com>
Date:   Tue Jun 5 20:26:49 2007 -0400

    Delete fbCompositeCopyAreammx()

diff --git a/fb/fbmmx.c b/fb/fbmmx.c
index 2e240c1..b2fe94b 100644
--- a/fb/fbmmx.c
+++ b/fb/fbmmx.c
@@ -356,29 +356,5 @@ fbCopyAreammx (DrawablePtr	pSrc,
     return TRUE;
 }
 
-void
-fbCompositeCopyAreammx (CARD8		op,
-			PicturePtr	pSrc,
-			PicturePtr	pMask,
-			PicturePtr	pDst,
-			INT16		xSrc,
-			INT16		ySrc,
-			INT16		xMask,
-			INT16		yMask,
-			INT16		xDst,
-			INT16		yDst,
-			CARD16		width,
-			CARD16		height)
-{
-    fbCopyAreammx (pSrc->pDrawable,
-		   pDst->pDrawable,
-		   xSrc, ySrc,
-		   xDst, yDst,
-		   width, height);
-}
-
-
-
-
 #endif /* RENDER */
 #endif /* USE_MMX */
diff --git a/fb/fbmmx.h b/fb/fbmmx.h
index 43079e9..4796438 100644
--- a/fb/fbmmx.h
+++ b/fb/fbmmx.h
@@ -52,18 +52,6 @@ Bool fbCopyAreammx (DrawablePtr	pSrc,
 		    int		dst_y,
 		    int		width,
 		    int		height);
-void fbCompositeCopyAreammx (CARD8	op,
-			     PicturePtr	pSrc,
-			     PicturePtr	pMask,
-			     PicturePtr	pDst,
-			     INT16	xSrc,
-			     INT16      ySrc,
-			     INT16      xMask,
-			     INT16      yMask,
-			     INT16      xDst,
-			     INT16      yDst,
-			     CARD16     width,
-			     CARD16     height);
 Bool fbSolidFillmmx (DrawablePtr	pDraw,
 		     int		x,
 		     int		y,