--- xf86-input-synaptics-1.1.99.1.orig/src/ps2comm.c	2009-08-21 05:11:56.000000000 -0400
+++ xf86-input-synaptics-1.1.99.1/src/ps2comm.c	2009-09-25 02:24:00.324586398 -0400
@@ -406,7 +406,9 @@
 	    break;
     }
 
+#if !(defined(__sun) && defined(__SVR4))
     xf86WaitForInput(fd, 20000);
+#endif
     xf86FlushInput(fd);
     if (ps2_synaptics_identify(fd, synhw)) {
 	return TRUE;