From bdf718907b3202815a04ec28a868689708f43da9 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue, 28 Nov 2006 18:06:34 +1030
Subject: [PATCH] dix:	missing parameter to SetCursorPosition in CheckMotion
 ifndef MPX

mi:	missing include in misprite.c ifndef MPX
---
 Changelog     | 11 +++++++++++
 dix/events.c  |  2 +-
 mi/misprite.c |  4 +---
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/Changelog b/Changelog
index a9989ebf1..7d0d80c65 100644
--- a/Changelog
+++ b/Changelog
@@ -8,6 +8,17 @@ Files:
 	dix/cursor.c
 	mi/mieq.c
 
+____________________________________________________________
+
+dix:	missing parameter to SetCursorPosition in CheckMotion ifndef MPX
+
+mi:	missing include in misprite.c ifndef MPX
+
+Files:
+	dix/events.c
+	mi/misprite.c
+
+
 == 27.11.06 ==
 mi:     free allocated memory in miDCCloseScreen and in miDCInitialize in case
 	of errors.
diff --git a/dix/events.c b/dix/events.c
index 27f42e1ba..8ef318a22 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -2136,7 +2136,7 @@ CheckMotion(xEvent *xE, DeviceIntPtr pDev)
 	    (pSprite->hotPhys.y != XE_KBPTR.rootY))
 	{
 	    (*pSprite->hotPhys.pScreen->SetCursorPosition)(
-		pSprite->hotPhys.pScreen,
+                pDev, pSprite->hotPhys.pScreen,
 		pSprite->hotPhys.x, pSprite->hotPhys.y, FALSE);
 	}
 #endif
diff --git a/mi/misprite.c b/mi/misprite.c
index ec90ad2dc..e55032bb8 100644
--- a/mi/misprite.c
+++ b/mi/misprite.c
@@ -56,15 +56,13 @@ in this Software without prior written authorization from The Open Group.
 # include   "mispritest.h"
 # include   "dixfontstr.h"
 # include   <X11/fonts/fontstruct.h>
+# include   "inputstr.h" 
 
 #ifdef RENDER
 # include   "mipict.h"
 #endif
 # include   "damage.h"
 
-#ifdef MPX
-# include   "inputstr.h" 
-#endif
 
 
 #define SPRITE_DEBUG_ENABLE 0