Change several LoaderSymbol calls introduced by the bug #400 patch toXORG-6_7_99_2XORG-6_7_99_1

*Weak() resolver functions.

1 files changed, 5 insertions, 6 deletions

diff --git a/src/riva_driver.c b/src/riva_driver.c
index c812bb7..efe1eb4 100644
--- a/src/riva_driver.c
+++ b/src/riva_driver.c
@@ -688,11 +688,11 @@ RivaPreInit(ScrnInfoPtr pScrn, int flags)
 	    xf86FreeInt10(pRiva->pInt);
 	    return FALSE;
 	}
-	pScrn->SwitchMode    = LoaderSymbol("fbdevHWSwitchMode");
-	pScrn->AdjustFrame   = LoaderSymbol("fbdevHWAdjustFrame");
+	pScrn->SwitchMode    = fbdevHWSwitchModeWeak();
+	pScrn->AdjustFrame   = fbdevHWAdjustFrameWeak();
 	pScrn->EnterVT       = RivaEnterVTFBDev;
-	pScrn->LeaveVT       = LoaderSymbol("fbdevHWLeaveVT");
-	pScrn->ValidMode     = LoaderSymbol("fbdevHWValidMode");
+	pScrn->LeaveVT       = fbdevHWLeaveVTWeak();
+	pScrn->ValidMode     = fbdevHWValidModeWeak();
     }
     pRiva->Rotate = 0;
     if ((s = xf86GetOptValString(pRiva->Options, OPTION_ROTATE))) {
@@ -1317,8 +1317,7 @@ RivaScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
     /* Initialize colormap layer.  
 	Must follow initialization of the default colormap */
     if(!xf86HandleColormaps(pScreen, 256, 8,
-	(pRiva->FBDev ? LoaderSymbol("fbdevHWLoadPalette")
-	              : Rivadac->LoadPalette), 
+	(pRiva->FBDev ? fbdevHWLoadPaletteWeak() : Rivadac->LoadPalette), 
 	NULL, CMAP_RELOAD_ON_MODE_SWITCH | CMAP_PALETTED_TRUECOLOR))
 	return FALSE;