xfree86: don't reset Auto(Add|Enable)Devices, use defaults from xf86Globals
Without this, commit ace38fafb0 is useless
when HAL support is disabled.
Signed-off-by: Julien Cristau <jcristau@debian.org>
			
			
This commit is contained in:
		
							parent
							
								
									6a1b2fed7e
								
							
						
					
					
						commit
						a54153e669
					
				| 
						 | 
				
			
			@ -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",
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue