Index: programs/Xserver/hw/xfree86/fbdevhw/fbdevhwstub.c
===================================================================
RCS file: /cvs/fd/xorg/xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhwstub.c,v
retrieving revision 1.2
diff -u -r1.2 fbdevhwstub.c
--- programs/Xserver/hw/xfree86/fbdevhw/fbdevhwstub.c	23 Apr 2004 19:54:01 -0000	1.2
+++ programs/Xserver/hw/xfree86/fbdevhw/fbdevhwstub.c	1 Aug 2004 13:37:33 -0000
@@ -168,3 +168,27 @@
 {
 	return FALSE;
 }
+
+xf86SwitchModeProc *
+fbdevHWSwitchModeWeak(void) { return fbdevHWSwitchMode; }
+
+xf86AdjustFrameProc *
+fbdevHWAdjustFrameWeak(void) { return fbdevHWAdjustFrame; }
+
+xf86EnterVTProc *
+fbdevHWEnterVTWeak(void) { return fbdevHWEnterVT; }
+
+xf86LeaveVTProc *
+fbdevHWLeaveVTWeak(void) { return fbdevHWLeaveVT; }
+
+xf86ValidModeProc *
+fbdevHWValidModeWeak(void) { return fbdevHWValidMode; }
+
+xf86DPMSSetProc *
+fbdevHWDPMSSetWeak(void) { return fbdevHWDPMSSet; }
+
+xf86LoadPaletteProc *
+fbdevHWLoadPaletteWeak(void) { return fbdevHWLoadPalette; }
+
+SaveScreenProcPtr
+fbdevHWSaveScreenWeak(void) { return fbdevHWSaveScreen; }
Index: programs/Xserver/hw/xfree86/xf1bpp/mfbmap.h
===================================================================
RCS file: /cvs/fd/xorg/xc/programs/Xserver/hw/xfree86/xf1bpp/mfbmap.h,v
retrieving revision 1.3
diff -u -r1.3 mfbmap.h
--- programs/Xserver/hw/xfree86/xf1bpp/mfbmap.h	30 Jul 2004 20:30:56 -0000	1.3
+++ programs/Xserver/hw/xfree86/xf1bpp/mfbmap.h	1 Aug 2004 13:34:05 -0000
@@ -45,6 +45,7 @@
 #define mfbGetWindowPixmap  xf1bppGetWindowPixmap
 #define mfbGetWindowPrivateIndex  xf1bppGetWindowPrivateIndex
 #define mfbGetmask  xf1bppGetmask
+#define mfbGetpartmasks xf1bppGetpartmasks
 #define mfbGetrmask  xf1bppGetrmask
 #define mfbGetstarttab  xf1bppGetstarttab
 #define mfbGetendtab  xf1bppGetendtab
Index: programs/Xserver/hw/xfree86/drivers/mga/mga_storm.c
===================================================================
RCS file: /cvs/fd/xorg/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_storm.c,v
retrieving revision 1.3
diff -u -r1.3 mga_storm.c
--- programs/Xserver/hw/xfree86/drivers/mga/mga_storm.c	30 Jul 2004 20:30:52 -0000	1.3
+++ programs/Xserver/hw/xfree86/drivers/mga/mga_storm.c	2 Aug 2004 20:57:37 -0000
@@ -745,7 +745,7 @@
 	infoPtr->SubsequentScreenToScreenColorExpandFill =
 		MGANAME(SubsequentPlanarScreenToScreenColorExpandFill);
 	infoPtr->CacheColorExpandDensity = PSZ;
-	infoPtr->CacheMonoStipple = LoaderSymbol("XAACachePlanarMonoStipple");
+	infoPtr->CacheMonoStipple = XAACachePlanarMonoStippleWeak();
 	/* It's faster to blit the stipples if you have fastbilt */
 	if(pMga->HasFBitBlt)
 	    infoPtr->ScreenToScreenColorExpandFillFlags = TRANSPARENCY_ONLY;