Change several LoaderSymbol calls introduced by the bug #400 patch to

*Weak() resolver functions.

3 files changed, 8 insertions, 8 deletions

diff --git a/src/mga_dac3026.c b/src/mga_dac3026.c
index 58aacdc..ecd0605 100644
--- a/src/mga_dac3026.c
+++ b/src/mga_dac3026.c
@@ -1282,6 +1282,6 @@ void MGA2064SetupFuncs(ScrnInfoPtr pScrn)
     pMga->ModeInit = MGA3026Init;
     pMga->ddc1Read = MGA3026_ddc1Read;
     /* vgaHWddc1SetSpeed will only work if the card is in VGA mode */
-    pMga->DDC1SetSpeed = LoaderSymbol("vgaHWddc1SetSpeed");
+    pMga->DDC1SetSpeed = vgaHWddc1SetSpeedWeak();
     pMga->i2cInit = MGA3026_i2cInit;
 }
diff --git a/src/mga_dacG.c b/src/mga_dacG.c
index e9ec043..4dc93e4 100644
--- a/src/mga_dacG.c
+++ b/src/mga_dacG.c
@@ -1331,7 +1331,7 @@ void MGAGSetupFuncs(ScrnInfoPtr pScrn)
     pMga->ModeInit = MGAGInit;
     pMga->ddc1Read = MGAG_ddc1Read;
     /* vgaHWddc1SetSpeed will only work if the card is in VGA mode */
-    pMga->DDC1SetSpeed = LoaderSymbol("vgaHWddc1SetSpeed");
+    pMga->DDC1SetSpeed = vgaHWddc1SetSpeedWeak();
     pMga->i2cInit = MGAG_i2cInit;
 }
 
diff --git a/src/mga_driver.c b/src/mga_driver.c
index d0bc9b2..12656d8 100644
--- a/src/mga_driver.c
+++ b/src/mga_driver.c
@@ -1029,7 +1029,7 @@ MGAdoDDC(ScrnInfoPtr pScrn)
       return NULL;
   } else {
     /* XXX Need to write an MGA mode ddc1SetSpeed */
-    if (pMga->DDC1SetSpeed == LoaderSymbol("vgaHWddc1SetSpeed")) {
+    if (pMga->DDC1SetSpeed == vgaHWddc1SetSpeedWeak()) {
       pMga->DDC1SetSpeed = NULL;
       xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2,
 		     "DDC1 disabled - chip not in VGA mode\n");
@@ -1692,11 +1692,11 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
 	xf86LoaderReqSymLists(fbdevHWSymbols, NULL);
 	if (!fbdevHWInit(pScrn, pMga->PciInfo, NULL))
 	    return FALSE;
-	pScrn->SwitchMode    = LoaderSymbol("fbdevHWSwitchMode");
-	pScrn->AdjustFrame   = LoaderSymbol("fbdevHWAdjustFrame");
+	pScrn->SwitchMode    = fbdevHWSwitchModeWeak();
+	pScrn->AdjustFrame   = fbdevHWAdjustFrameWeak();
 	pScrn->EnterVT       = MGAEnterVTFBDev;
-	pScrn->LeaveVT       = LoaderSymbol("fbdevHWLeaveVT");
-	pScrn->ValidMode     = LoaderSymbol("fbdevHWValidMode");
+	pScrn->LeaveVT       = fbdevHWLeaveVTWeak();
+	pScrn->ValidMode     = fbdevHWValidModeWeak();
     }
     pMga->Rotate = 0;
     if ((s = xf86GetOptValString(pMga->Options, OPTION_ROTATE))) {
@@ -3428,7 +3428,7 @@ MGAScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
     else
 	f = CMAP_RELOAD_ON_MODE_SWITCH;
     if(!xf86HandleColormaps(pScreen, 256, 8,
-	pMga->FBDev ? LoaderSymbol("fbdevHWLoadPalette") : MGAdac->LoadPalette,
+	pMga->FBDev ? fbdevHWLoadPaletteWeak() : MGAdac->LoadPalette,
 	NULL, f))
 	return FALSE;