Xi: Fix mishandled git merge

Signed-off-by: Jeremy Huddleston <[email protected]>

Author: jeremyhu

Xi/xichangehierarchy.c

@@ -215,19 +215,6 @@ disable_clientpointer(DeviceIntPtr dev)
     }
 }
 
-static int
-disable_clientpointer(DeviceIntPtr dev)
-{
-    int i;
-
-    for (i = 0; i < currentMaxClients; i++)
-    {
-        ClientPtr client = clients[i];
-        if (client && client->clientPtr == dev)
-            client->clientPtr = NULL;
-    }
-}
-
 static int
 remove_master(ClientPtr client, xXIRemoveMasterInfo *r,
               int flags[MAXDEVICES])