summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@redhat.com>2008-11-18 08:19:45 +1000
committerPeter Hutterer <peter.hutterer@redhat.com>2008-11-21 08:48:38 +1000
commitace38fafb062372dcd3d56378b5b8f86525c6241 (patch)
tree97ceb2c0acb165f4365de4c14ee4c179af9fcf00
parent1cd894173ee7fa3d1a78d330c12453ea53e7b908 (diff)
xfree86: without CONFIG_HAL, Auto{Add|Enable}Devices and AEI is false.
There's little chance that we'll get the input devices at runtime without HAL, we might as well force the server to add mouse/kbd devices automatically - just like in the olden days. Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
-rw-r--r--hw/xfree86/common/xf86Globals.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c
index dfc2bd7bb..db3b68463 100644
--- a/hw/xfree86/common/xf86Globals.c
+++ b/hw/xfree86/common/xf86Globals.c
@@ -129,9 +129,15 @@ xf86InfoRec xf86Info = {
.kbdCustomKeycodes = FALSE,
.disableRandR = FALSE,
.randRFrom = X_DEFAULT,
+#ifdef CONFIG_HAL
.allowEmptyInput = TRUE,
.autoAddDevices = TRUE,
.autoEnableDevices = TRUE
+#else
+ .allowEmptyInput = FALSE,
+ .autoAddDevices = FALSE,
+ .autoEnableDevices = FALSE
+#endif
};
const char *xf86ConfigFile = NULL;
const char *xf86InputDeviceList = NULL;