Remove useless loader symbol lists.
This commit is contained in:
parent
17885c5cb1
commit
8fe24e48ac
@ -125,30 +125,6 @@ static const OptionInfoRec DUMMYOptions[] = {
|
|||||||
{ -1, NULL, OPTV_NONE, {0}, FALSE }
|
{ -1, NULL, OPTV_NONE, {0}, FALSE }
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
/*
|
|
||||||
* List of symbols from other modules that this module references. This
|
|
||||||
* list is used to tell the loader that it is OK for symbols here to be
|
|
||||||
* unresolved providing that it hasn't been told that they haven't been
|
|
||||||
* told that they are essential via a call to xf86LoaderReqSymbols() or
|
|
||||||
* xf86LoaderReqSymLists(). The purpose is this is to avoid warnings about
|
|
||||||
* unresolved symbols that are not required.
|
|
||||||
*/
|
|
||||||
|
|
||||||
static const char *fbSymbols[] = {
|
|
||||||
"fbPictureInit",
|
|
||||||
"fbScreenInit",
|
|
||||||
NULL
|
|
||||||
};
|
|
||||||
|
|
||||||
static const char *ramdacSymbols[] = {
|
|
||||||
"xf86CreateCursorInfoRec",
|
|
||||||
"xf86DestroyCursorInfoRec",
|
|
||||||
"xf86InitCursor",
|
|
||||||
NULL
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
#ifdef XFree86LOADER
|
#ifdef XFree86LOADER
|
||||||
|
|
||||||
static MODULESETUPPROTO(dummySetup);
|
static MODULESETUPPROTO(dummySetup);
|
||||||
@ -187,11 +163,6 @@ dummySetup(pointer module, pointer opts, int *errmaj, int *errmin)
|
|||||||
* by calling LoadSubModule().
|
* by calling LoadSubModule().
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*
|
|
||||||
* Tell the loader about symbols from other modules that this module
|
|
||||||
* might refer to.
|
|
||||||
*/
|
|
||||||
LoaderRefSymLists(fbSymbols, ramdacSymbols, NULL);
|
|
||||||
/*
|
/*
|
||||||
* The return value must be non-NULL on success even though there
|
* The return value must be non-NULL on success even though there
|
||||||
* is no TearDownProc.
|
* is no TearDownProc.
|
||||||
@ -470,12 +441,10 @@ DUMMYPreInit(ScrnInfoPtr pScrn, int flags)
|
|||||||
if (xf86LoadSubModule(pScrn, "fb") == NULL) {
|
if (xf86LoadSubModule(pScrn, "fb") == NULL) {
|
||||||
RETURN;
|
RETURN;
|
||||||
}
|
}
|
||||||
xf86LoaderReqSymLists(fbSymbols, NULL);
|
|
||||||
|
|
||||||
if (!dPtr->swCursor) {
|
if (!dPtr->swCursor) {
|
||||||
if (!xf86LoadSubModule(pScrn, "ramdac"))
|
if (!xf86LoadSubModule(pScrn, "ramdac"))
|
||||||
RETURN;
|
RETURN;
|
||||||
xf86LoaderReqSymLists(ramdacSymbols, NULL);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* We have no contiguous physical fb in physical memory */
|
/* We have no contiguous physical fb in physical memory */
|
||||||
|
Loading…
Reference in New Issue
Block a user