xserver: Branch 'master'

[Greg Kroah-Hartman]

 hw/xfree86/xf4bpp/ppcGC.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

New commits:
diff-tree b20ae5ddb7682bafcee6f8bf0c8208a3f70b882b (from 4d258f31967141e3c4a6e4abbef89ffa717e85aa)
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date:   Mon Jun 19 11:38:52 2006 -0700

    fix compiler warnings in hw/xfree86/xf4bpp/ppcGC.c

diff --git a/hw/xfree86/xf4bpp/ppcGC.c b/hw/xfree86/xf4bpp/ppcGC.c
index 1a2de42..4aafb70 100644
--- a/hw/xfree86/xf4bpp/ppcGC.c
+++ b/hw/xfree86/xf4bpp/ppcGC.c
@@ -97,8 +97,8 @@ SOFTWARE.
  */
 static GCFuncs vgaGCFuncs = {
 	xf4bppValidateGC,
-	(void (*)())NoopDDA,
-	(void (*)())NoopDDA,
+	(void (*)(GCPtr, unsigned long))NoopDDA,
+	(void (*)(GCPtr, unsigned long, GCPtr))NoopDDA,
 	xf4bppDestroyGC,
 	xf4bppChangeClip,
 	xf4bppDestroyClip,