xserver: Branch 'master'

[Greg Kroah-Hartman]

 hw/dmx/dmxcmap.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree 59836c0f2abee3339e1aa30dacadb82e477943d6 (from 12563db59dd613ecc926e3bed9534152ebc0a2fb)
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date:   Wed Jul 5 09:30:48 2006 -0700

    fix wrong function pointer type in hw/dmx/dmxcmap.c

diff --git a/hw/dmx/dmxcmap.c b/hw/dmx/dmxcmap.c
index f46dc54..b4279e7 100644
--- a/hw/dmx/dmxcmap.c
+++ b/hw/dmx/dmxcmap.c
@@ -46,7 +46,7 @@
 
 #include "micmap.h"
 
-static int dmxInitColormapPrivateFunc(ColormapPtr pColormap)
+static int dmxInitColormapPrivateFunc(ColormapPtr pColormap, int index)
 {
     return TRUE;
 }