xserver: Branch 'master'

[Alan Coopersmith]

 fb/fbpict.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree 7c0ca27f6dd0a800dc27429a33dbc8e133f9a9c1 (from 0a4e9311158ed3ecda0722640f860ace2f87a97e)
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Wed Jul 11 17:15:29 2007 -0700

    "fbpict.c", line 215: void function cannot return value

diff --git a/fb/fbpict.c b/fb/fbpict.c
index ead84d7..9efa0e8 100644
--- a/fb/fbpict.c
+++ b/fb/fbpict.c
@@ -210,7 +210,7 @@ fbCompositeGeneral (CARD8	op,
 		    CARD16	width,
 		    CARD16	height)
 {
-    return fbComposite (op, pSrc, pMask, pDst,
+    fbComposite (op, pSrc, pMask, pDst,
 			xSrc, ySrc, xMask, yMask, xDst, yDst,
 			width, height);
 }