diff -ur xorg-server-1.7.6/Xi/listdev.c xorg-server-1.7.6.orig/Xi/listdev.c
--- xorg-server-1.7.6/Xi/listdev.c	2010-05-08 16:51:40.717128126 -0700
+++ xorg-server-1.7.6.orig/Xi/listdev.c	2009-10-27 23:56:19.000000000 -0700
@@ -180,10 +180,10 @@
 	dev->use = IsXKeyboard;
     else if (IsMaster(d) && IsPointerDevice(d))
 	dev->use = IsXPointer;
-    else if (d->valuator && d->button)
-        dev->use = IsXExtensionPointer;
     else if (d->key && d->kbdfeed)
         dev->use = IsXExtensionKeyboard;
+    else if (d->valuator && d->button)
+        dev->use = IsXExtensionPointer;
     else
 	dev->use = IsXExtensionDevice;