xserver: Branch 'master'

[Brian Paul]

 hw/dmx/dmxcursor.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

New commits:
diff-tree 891e9c3e6cbd0869a57395b96c8e18ff522c2bb4 (from a10039a100dfe5f87e29e9cc4fa656176e0890f9)
Author: Brian <brian at yutani.localnet.net>
Date:   Sat Sep 23 10:28:24 2006 -0600

    Replace broken DMXDBG3() with DMXDBG2()

diff --git a/hw/dmx/dmxcursor.c b/hw/dmx/dmxcursor.c
index a49fc9f..e74a052 100644
--- a/hw/dmx/dmxcursor.c
+++ b/hw/dmx/dmxcursor.c
@@ -664,8 +664,8 @@ static Bool _dmxUnrealizeCursor(ScreenPt
 {
     DMXScreenInfo    *dmxScreen = &dmxScreens[pScreen->myNum];
 
-    DMXDBG3("_dmxUnrealizeCursor(%d,%p) %p\n",
-            pScreen->myNum, pCursor, pCursorPriv);
+    DMXDBG2("_dmxUnrealizeCursor(%d,%p)\n",
+            pScreen->myNum, pCursor);
 
     if (dmxScreen->beDisplay) {
 	if (dmxBEFreeCursor(pScreen, pCursor))