Commit 74d84d7b authored by Kevin E Martin's avatar Kevin E Martin
Browse files

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

    #1133, Kristian Hgsberg).
parent bd3e6e44
...@@ -144,7 +144,7 @@ static int numFormats = 6; ...@@ -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) ...@@ -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())) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment