summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@redhat.com>2009-09-18 22:08:16 -0400
committerKristian Høgsberg <krh@redhat.com>2009-09-18 22:08:16 -0400
commit9ffcb438f9208c1be3044cdac551a3d6bd04f08a (patch)
tree0ae3ebbd51989f25ab8c43e98cdfdeff68010d81
parentc63fb2de8457b63078afc589ef13e419f06f6a95 (diff)
Disble autoAddDevices when in wayland mode
-rw-r--r--hw/xfree86/common/xf86Config.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index e81eb0f63..d60acbea7 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -870,6 +870,10 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
xf86Msg(from, "%sutomatically enabling devices\n",
xf86Info.autoEnableDevices ? "A" : "Not a");
+ if (xorgWayland) {
+ xf86Info.autoAddDevices = FALSE;
+ xf86Info.autoEnableDevices = FALSE;
+ }
/*
* Set things up based on the config file information. Some of these
* settings may be overridden later when the command line options are