--- a/hw/xgl/xglinput.c
+++ b/hw/xgl/xglinput.c
@@ -51,9 +51,9 @@ xglMouseProc (DeviceIntPtr pDevice,
        InitPointerDeviceStruct (pDev,
                                 map,
                                 NUM_BUTTONS,
-                                miPointerGetMotionEvents,
+                                GetMotionHistory,
                                 (PtrCtrlProcPtr) NoopDDA,
-                                miPointerGetMotionBufferSize ());
+                                0, 2);
        break;
     case DEVICE_ON:
        pDev->on = TRUE;
@@ -259,5 +259,5 @@ xglInitInput (int argc, char **argv)
     RegisterKeyboardDevice (pKeyboard);

     miRegisterPointerDevice (screenInfo.screens[0], pPointer);
-    mieqInit (&pKeyboard->public, &pPointer->public);
+    mieqInit ();
}