summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Cardona <remi@gentoo.org>2008-11-21 16:39:00 +0100
committerJulien Cristau <jcristau@debian.org>2008-11-21 18:55:07 +0100
commita54153e669fd293a47f0077bf25505dd545ddce2 (patch)
tree52c3c3f6e7529de42473d9e5dd3cba0b778a56e8
parent6a1b2fed7e465a9c652e8ee250b8eab440945862 (diff)
xfree86: don't reset Auto(Add|Enable)Devices, use defaults from xf86Globals
Without this, commit ace38fafb062372dcd3d56378b5b8f86525c6241 is useless when HAL support is disabled. Signed-off-by: Julien Cristau <jcristau@debian.org>
-rw-r--r--hw/xfree86/common/xf86Config.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index 0583f0fc7..a6290a7fa 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -890,7 +890,6 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
from = X_CONFIG;
}
else {
- xf86Info.autoAddDevices = TRUE;
from = X_DEFAULT;
}
xf86Msg(from, "%sutomatically adding devices\n",
@@ -902,7 +901,6 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
from = X_CONFIG;
}
else {
- xf86Info.autoEnableDevices = TRUE;
from = X_DEFAULT;
}
xf86Msg(from, "%sutomatically enabling devices\n",