Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug

This commit is contained in:
Daniel Stone 2006-08-29 15:16:01 +03:00 committed by Daniel Stone
commit 7fa3383e3c
2 changed files with 0 additions and 9 deletions

View File

@ -100,10 +100,6 @@ void DoScanPci(int argc, char **argv, int i)
LoaderErrorMsg(NULL, "scanpci", errmaj, errmin);
exit(1);
}
if (LoaderCheckUnresolved(LD_RESOLV_IFDONE)) {
/* For now, just a warning */
xf86Msg(X_WARNING, "Some symbols could not be resolved!\n");
}
PciSetup = (ScanPciSetupProcPtr)LoaderSymbol("ScanPciSetupPciIds");
DisplayPCICardInfo =
(ScanPciDisplayCardInfoProcPtr)LoaderSymbol("ScanPciDisplayPCICardInfo");

View File

@ -957,11 +957,6 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
#endif
}
if ((serverGeneration == 1) && LoaderCheckUnresolved(LD_RESOLV_IFDONE)) {
/* For now, just a warning */
xf86Msg(X_WARNING, "Some symbols could not be resolved!\n");
}
xf86PostScreenInit();
xf86InitOrigins();