Merge branch 'master' into input-hotplug

This commit is contained in:
Daniel Stone 2006-08-24 10:59:33 +03:00 • committed by Daniel Stone
commit 4adf9af313
30 changed files with 2215 additions and 3708 deletions

View file

@ -321,6 +321,10 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
/* Tell the loader the default module search path */
LoaderSetPath(xf86ModulePath);
if (xf86Info.ignoreABI) {
LoaderSetOptions(LDR_OPT_ABI_MISMATCH_NONFATAL);
}
#ifdef TESTING
{
char **list, **l;