diff options
| author | marha <marha@users.sourceforge.net> | 2010-01-05 08:57:42 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-01-05 08:57:42 +0000 |
| commit | 4b1326f06330c00501dd84100ed3a1987e2fa631 (patch) | |
| tree | 6675ebcf771a6fdfeb9a2164f08811407731482e /xorg-server/hw/xfree86/common/xf86Globals.c | |
| parent | 7397e255c2e82618ab55ef2c81636c8e688b1225 (diff) | |
| parent | 163827567b71b0763a4c1a7104159cd08b5c2d95 (diff) | |
| download | vcxsrv-4b1326f06330c00501dd84100ed3a1987e2fa631.tar.gz vcxsrv-4b1326f06330c00501dd84100ed3a1987e2fa631.tar.bz2 vcxsrv-4b1326f06330c00501dd84100ed3a1987e2fa631.zip | |
svn merge ^/branches/released
Diffstat (limited to 'xorg-server/hw/xfree86/common/xf86Globals.c')
| -rw-r--r-- | xorg-server/hw/xfree86/common/xf86Globals.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/xorg-server/hw/xfree86/common/xf86Globals.c b/xorg-server/hw/xfree86/common/xf86Globals.c index 98f828483..8b483f35c 100644 --- a/xorg-server/hw/xfree86/common/xf86Globals.c +++ b/xorg-server/hw/xfree86/common/xf86Globals.c @@ -132,7 +132,7 @@ xf86InfoRec xf86Info = { .kbdCustomKeycodes = FALSE, .disableRandR = FALSE, .randRFrom = X_DEFAULT, -#ifdef CONFIG_HAL +#if defined(CONFIG_HAL) || defined(CONFIG_UDEV) .allowEmptyInput = TRUE, .autoAddDevices = TRUE, .autoEnableDevices = TRUE @@ -143,6 +143,7 @@ xf86InfoRec xf86Info = { #endif }; const char *xf86ConfigFile = NULL; +const char *xf86ConfigDir = NULL; const char *xf86ModulePath = DEFAULT_MODULE_PATH; MessageType xf86ModPathFrom = X_DEFAULT; const char *xf86LogFile = DEFAULT_LOGPREFIX; |