summaryrefslogtreecommitdiff
path: root/xserver/include
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2011-06-29 19:55:02 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2011-06-29 19:55:02 +0000
commitd5addd6cfdfde634c1ce80a5a32aa0b0fc85d0b7 (patch)
treead569b5295c96519e707bd0702744e211135ecf3 /xserver/include
parent477eb3da759b766eaea9729de518e8791ae3e28e (diff)
Introduce new autoconfiguration code for X input drivers, based on X
hotplug framework.This also takes care of the configuration of the keyboard layout from the wscons layout that was hacked inside the keyboard driver. Tested by many, ok oga@.
Diffstat (limited to 'xserver/include')
-rw-r--r--xserver/include/dix-config.h.in3
-rw-r--r--xserver/include/do-not-use-config.h.in3
2 files changed, 6 insertions, 0 deletions
diff --git a/xserver/include/dix-config.h.in b/xserver/include/dix-config.h.in
index a618f94b4..766116725 100644
--- a/xserver/include/dix-config.h.in
+++ b/xserver/include/dix-config.h.in
@@ -411,6 +411,9 @@
/* Support HAL for hotplug */
#undef CONFIG_HAL
+/* Use wscons for input auto configuration */
+#undef CONFIG_WSCONS
+
/* Have a monotonic clock from clock_gettime() */
#undef MONOTONIC_CLOCK
diff --git a/xserver/include/do-not-use-config.h.in b/xserver/include/do-not-use-config.h.in
index 11bd3b625..08c842605 100644
--- a/xserver/include/do-not-use-config.h.in
+++ b/xserver/include/do-not-use-config.h.in
@@ -39,6 +39,9 @@
/* Use libudev for input hotplug */
#undef CONFIG_UDEV
+/* Use wscons for input auto configuration */
+#undef CONFIG_WSCONS
+
/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
systems. This function is required for `alloca.c' support on those systems.
*/