diff --git a/Xi/extinit.c b/Xi/extinit.c
index b8280106a..1f7772911 100644
--- a/Xi/extinit.c
+++ b/Xi/extinit.c
@@ -1069,21 +1069,6 @@ IResetProc(ExtensionEntry * unused)
     RestoreExtensionEvents();
 }
 
-/*****************************************************************
- *
- * Returns TRUE if the device has some sort of pointer type.
- *
- */
-
-Bool
-DeviceIsPointerType(DeviceIntPtr dev)
-{
-    if (dev_type[1].type == dev->type)
-        return TRUE;
-
-    return FALSE;
-}
-
 
 /***********************************************************************
  *
diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
index aa98dad1a..6df0b8af2 100644
--- a/hw/xfree86/common/xf86Xinput.c
+++ b/hw/xfree86/common/xf86Xinput.c
@@ -326,15 +326,8 @@ xf86ActivateDevice(LocalDevicePtr local)
         dev->isMaster = FALSE;
         dev->spriteInfo->spriteOwner = FALSE;
 
-        if (DeviceIsPointerType(dev))
-        {
-            dev->deviceGrab.ActivateGrab = ActivatePointerGrab;
-            dev->deviceGrab.DeactivateGrab = DeactivatePointerGrab;
-        } else 
-        {
-            dev->deviceGrab.ActivateGrab = ActivateKeyboardGrab;
-            dev->deviceGrab.DeactivateGrab = DeactivateKeyboardGrab;
-        }
+        dev->deviceGrab.ActivateGrab = ActivateKeyboardGrab;
+        dev->deviceGrab.DeactivateGrab = DeactivateKeyboardGrab;
 
         RegisterOtherDevice(dev);
         XkbSetExtension(dev, ProcessKeyboardEvent);
diff --git a/include/extinit.h b/include/extinit.h
index 340433a83..0b36d3bcd 100644
--- a/include/extinit.h
+++ b/include/extinit.h
@@ -37,11 +37,6 @@ XInputExtensionInit(
 	void
 	);
 
-extern _X_EXPORT Bool
-DeviceIsPointerType(
-        DeviceIntPtr dev
-        );
-
 extern _X_EXPORT void
 AssignTypeAndName (
 	DeviceIntPtr           /* dev */,