diff options
| author | Adam Jackson <ajax@nwnk.net> | 2004-07-31 01:21:18 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2004-07-31 01:21:18 +0000 |
| commit | c64f90b673f5c487dfe059f1636b04a1c2ab7dc2 (patch) | |
| tree | 54de8ac9aaf7776eeddcf089444763fc9769f37b | |
| parent | b091b4b074cd61c9067ba95ef016f7a29a38c38d (diff) | |
Change several LoaderSymbol calls introduced by the bug #400 patch to
*Weak() resolver functions.
| -rw-r--r-- | src/r128_driver.c | 10 | ||||
| -rw-r--r-- | src/radeon_driver.c | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/r128_driver.c b/src/r128_driver.c index ce2a1026..21f5d9de 100644 --- a/src/r128_driver.c +++ b/src/r128_driver.c @@ -1921,9 +1921,9 @@ Bool R128PreInit(ScrnInfoPtr pScrn, int flags) if (!xf86LoadSubModule(pScrn, "fbdevhw")) return FALSE; xf86LoaderReqSymLists(fbdevHWSymbols, NULL); if (!fbdevHWInit(pScrn, info->PciInfo, NULL)) return FALSE; - pScrn->SwitchMode = LoaderSymbol("fbdevHWSwitchMode"); - pScrn->AdjustFrame = LoaderSymbol("fbdevHWAdjustFrame"); - pScrn->ValidMode = LoaderSymbol("fbdevHWValidMode"); + pScrn->SwitchMode = fbdevHWSwitchModeWeak(); + pScrn->AdjustFrame = fbdevHWAdjustFrameWeak(); + pScrn->ValidMode = fbdevHWValidModeWeak(); } if (!info->FBDev) @@ -2427,7 +2427,7 @@ Bool R128ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) /* Colormap setup */ if (!miCreateDefColormap(pScreen)) return FALSE; if (!xf86HandleColormaps(pScreen, 256, info->dac6bits ? 6 : 8, - (info->FBDev ? LoaderSymbol("fbdevHWLoadPalette") : + (info->FBDev ? fbdevHWLoadPaletteWeak() : R128LoadPalette), NULL, CMAP_PALETTED_TRUECOLOR | CMAP_RELOAD_ON_MODE_SWITCH @@ -2438,7 +2438,7 @@ Bool R128ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) /* DPMS setup - FIXME: also for mirror mode in non-fbdev case? - Michel */ if (info->FBDev) - xf86DPMSInit(pScreen, LoaderSymbol("fbdevHWDPMSSet"), 0); + xf86DPMSInit(pScreen, fbdevHWDPMSSetWeak(), 0); else { if (!info->HasPanelRegs || info->BIOSDisplay == R128_BIOS_DISPLAY_CRT) xf86DPMSInit(pScreen, R128DisplayPowerManagementSet, 0); diff --git a/src/radeon_driver.c b/src/radeon_driver.c index 742d4aa4..3b5b083e 100644 --- a/src/radeon_driver.c +++ b/src/radeon_driver.c @@ -4178,7 +4178,7 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags) xf86LoaderReqSymLists(fbdevHWSymbols, NULL); if (fbdevHWInit(pScrn, info->PciInfo, NULL)) { - pScrn->ValidMode = LoaderSymbol("fbdevHWValidMode"); + pScrn->ValidMode = fbdevHWValidModeWeak(); info->FBDev = TRUE; xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Using framebuffer device\n"); |