[patch] InputDevices patch

10500_all_InputDevices.patch (text/plain), 848 bytes, created by Andrew Bevitt on 2003-08-26 23:04:39 UTC

diff -u -r3.272 xf86Config.c
--- xc/programs/Xserver/hw/xfree86/common/xf86Config.c.orig	24 Aug 2003 20:52:30 -0000	3.272
+++ xc/programs/Xserver/hw/xfree86/common/xf86Config.c	27 Aug 2003 02:26:17 -0000
@@ -1451,7 +1451,7 @@
 	indp[count - 1].extraOptions = xf86addNewOption(NULL, "CorePointer", NULL);
 	indp[count].identifier = NULL;
 	servlayoutp->inputs = indp;
-    } else {
+    } else if (!havePointer) {
 	/* This should never happen. */
 	xf86Msg(X_ERROR, "Cannot locate a core pointer device.\n");
 	return FALSE;
@@ -1473,7 +1473,7 @@
 	indp[count - 1].extraOptions = xf86addNewOption(NULL, "CoreKeyboard", NULL);
 	indp[count].identifier = NULL;
 	servlayoutp->inputs = indp;
-    } else {
+    } else if (!haveKeyboard) {
 	/* This should never happen. */
 	xf86Msg(X_ERROR, "Cannot locate a core keyboard device\n");
 	return FALSE;