xserver: Branch 'master'

[Julien Cristau]

 hw/xfree86/common/xf86Config.c |    2 --
 1 file changed, 2 deletions(-)

New commits:
commit a54153e669fd293a47f0077bf25505dd545ddce2
Author: Rémi Cardona <remi at gentoo.org>
Date:   Fri Nov 21 16:39:00 2008 +0100

    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 at debian.org>

diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index 0583f0f..a6290a7 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",