+++ /dev/null
-===================================================================
-RCS file: /xf86/anoncvs/cvs/xc/programs/Xserver/hw/xfree86/common/xf86Config.c,v
-retrieving revision 3.272
-retrieving revision 3.273
-diff -u -p -r3.272 -r3.273
---- xc/programs/Xserver/hw/xfree86/common/xf86Config.c 2003/08/24 20:52:30 3.272
-+++ xc/programs/Xserver/hw/xfree86/common/xf86Config.c 2003/08/27 02:50:25 3.273
-@@ -1451,7 +1451,7 @@ checkCoreInputDevices(serverLayoutPtr se
- 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 @@ checkCoreInputDevices(serverLayoutPtr se
- 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;