Common subdirectories: cvs-ro/xc/programs/Xserver/hw/dmx/input//CVS and cvs-rw/xc/programs/Xserver/hw/dmx/input//CVS
diff -u cvs-ro/xc/programs/Xserver/hw/dmx/input//Imakefile cvs-rw/xc/programs/Xserver/hw/dmx/input//Imakefile
--- cvs-ro/xc/programs/Xserver/hw/dmx/input//Imakefile	Wed Jun 30 13:06:55 2004
+++ cvs-rw/xc/programs/Xserver/hw/dmx/input//Imakefile	Fri Jul  2 16:11:24 2004
@@ -8,7 +8,7 @@
 RAWOBJS = lnx-keyboard.o lnx-ms.o lnx-ps2.o
 #endif
 
-#ifndef __sgi
+#ifdef __linux__
 USBSRCS = usb-keyboard.c usb-mouse.c usb-other.c usb-common.c
 USBOBJS = usb-keyboard.o usb-mouse.o usb-other.o usb-common.o
 #endif
diff -u cvs-ro/xc/programs/Xserver/hw/dmx/input//dmxsigio.c cvs-rw/xc/programs/Xserver/hw/dmx/input//dmxsigio.c
--- cvs-ro/xc/programs/Xserver/hw/dmx/input//dmxsigio.c	Wed Jun 30 13:06:55 2004
+++ cvs-rw/xc/programs/Xserver/hw/dmx/input//dmxsigio.c	Fri Jul  2 16:04:53 2004
@@ -42,7 +42,7 @@
 #include "dmxevents.h"
 #include <signal.h>
 #include <unistd.h>
-#include <sys/fcntl.h>
+#include <fcntl.h>
 
 static int  dmxFdCount      = 0;
 static Bool dmxInputEnabled = TRUE;
@@ -49,7 +49,11 @@
 
 /* Define equivalents for non-POSIX systems (e.g., SGI IRIX) */
 #ifndef O_ASYNC
-#define O_ASYNC FASYNC
+# ifdef FASYNC
+#  define O_ASYNC FASYNC
+# else
+#  define O_ASYNC 0
+# endif
 #endif
 #ifndef O_NONBLOCK
 #define O_NONBLOCK FNONBLK