← Back to branch summary

~darkxst/ubuntu/raring/xorg-server/lp1073724

« back to all changes in this revision

Viewing changes to hw/xfree86/common/xf86Globals.c

  • Committer: Bazaar Package Importer
  • Author(s): Bryce Harrington
  • Date: 2010-06-07 14:50:49 UTC
  • mfrom: (0.9.4 upstream)
  • mto: This revision was merged to the branch mainline in revision 187.
  • Revision ID: james.westby@ubuntu.com-20100607145049-eys326hqtq5mjqxt
Tags: upstream-1.8.1.901
Import upstream version 1.8.1.901

Show diffs side-by-side

added added

removed removed

Lines of Context:
hw/xfree86/common/xf86Globals.c
132
132
    .kbdCustomKeycodes          = FALSE,
133
133
    .disableRandR               = FALSE,
134
134
    .randRFrom                  = X_DEFAULT,
135
 
#ifdef CONFIG_HAL
 
135
#if defined(CONFIG_HAL) || defined(CONFIG_UDEV)
136
136
    .allowEmptyInput            = TRUE,
137
137
    .autoAddDevices             = TRUE,
138
138
    .autoEnableDevices          = TRUE
143
143
#endif
144
144
};
145
145
const char *xf86ConfigFile = NULL;
 
146
const char *xf86ConfigDir = NULL;
146
147
const char *xf86ModulePath = DEFAULT_MODULE_PATH;
147
148
MessageType xf86ModPathFrom = X_DEFAULT;
148
149
const char *xf86LogFile = DEFAULT_LOGPREFIX;