diff options
| author | Keith Packard <keithp@keithp.com> | 2011-10-03 13:56:06 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-10-03 13:56:06 -0700 |
| commit | 6378d0233d21088b6429755627b4253859892c72 (patch) | |
| tree | 46061506e4ddda8163c56f14d614f3d620dffe68 /hw/xfree86/common/xf86Config.c | |
| parent | 6e965d8a185087a55b2100b817e18f05b3ce5a00 (diff) | |
| parent | 98b230669f591bf5b8b8764db3b287d91857ee9e (diff) | |
Merge remote-tracking branch 'herrb/master'
Diffstat (limited to 'hw/xfree86/common/xf86Config.c')
| -rw-r--r-- | hw/xfree86/common/xf86Config.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c index d19539960..f8c1b6567 100644 --- a/hw/xfree86/common/xf86Config.c +++ b/hw/xfree86/common/xf86Config.c @@ -1318,12 +1318,14 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout) } if (!xf86Info.forceInputDevices && !(foundPointer && foundKeyboard)) { -#if defined(CONFIG_HAL) || defined(CONFIG_UDEV) +#if defined(CONFIG_HAL) || defined(CONFIG_UDEV) || defined(CONFIG_WSCONS) const char *config_backend; #if defined(CONFIG_HAL) config_backend = "HAL"; -#else +#elif defined(CONFIG_UDEV) config_backend = "udev"; +#else + config_backend = "wscons"; #endif xf86Msg(X_INFO, "The server relies on %s to provide the list of " "input devices.\n\tIf no devices become available, " |