Fix keyboard driver failing to initialize if DoLoadableServer is NO (Bug

#1133, Kristian Høgsberg).
This commit is contained in:
Kevin E Martin 2004-08-20 05:22:39 +00:00
parent bd3e6e4425
commit 74d84d7b12

View File

@ -144,7 +144,7 @@ static int numFormats = 6;
#endif #endif
static Bool formatsDone = FALSE; static Bool formatsDone = FALSE;
InputDriverRec xf86KEYBOARD = { InputDriverRec XF86KEYBOARD = {
1, 1,
"keyboard", "keyboard",
NULL, NULL,
@ -425,7 +425,7 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
#ifdef USE_DEPRECATED_KEYBOARD_DRIVER #ifdef USE_DEPRECATED_KEYBOARD_DRIVER
/* Setup the builtin input drivers */ /* Setup the builtin input drivers */
xf86AddInputDriver(&xf86KEYBOARD, NULL, 0); xf86AddInputDriver(&XF86KEYBOARD, NULL, 0);
#endif #endif
/* Load all input driver modules specified in the config file. */ /* Load all input driver modules specified in the config file. */
if ((modulelist = xf86InputDriverlistFromConfig())) { if ((modulelist = xf86InputDriverlistFromConfig())) {