--- XFree86-4.2.1/xc/programs/Xserver/hw/xfree86/drivers/sis/sis_driver.c.sis-unresolved-symbols Mon Aug 26 08:02:32 2002 +++ XFree86-4.2.1/xc/programs/Xserver/hw/xfree86/drivers/sis/sis_driver.c Mon Aug 26 08:21:08 2002 @@ -296,6 +296,16 @@ "VBEInit", "vbeDoEDID", "vbeFree", + "VBEGetVBEInfo", + "VBEFreeVBEInfo", + "VBESaveRestore", + "VBEGetVBEMode", + "VBESetVBEMode", + "VBESetGetLogicalScanlineLength", + "VBEGetModeInfo", + "VBEFreeModeInfo", + "VBESetDisplayStart", + "", NULL }; @@ -639,6 +649,7 @@ if (flags & PROBE_DETECT) { if (xf86LoadSubModule(pScrn, "vbe")) { + xf86LoaderReqSymLists(vbeSymbols, NULL); int index = xf86GetEntityInfo(pScrn->entityList[0])->index; if ((pVbe = VBEInit(NULL,index))) { ConfiguredMonitor = vbeDoEDID(pVbe, NULL); @@ -1232,6 +1243,12 @@ } #if 0 +/* Note: Dunno why this code is here, but I just noticed that the variable + * "ret" is not within scope of the above anonymous code block, and as such + * does not exist at this point in the code. This code block should be moved + * into the anonymous block above to be within scope of ret, if it is ever + * removed from this #if 0 block. Mike A. Harris + */ if (!ret && pSiS->ddc1Read) xf86SetDDCProperties(xf86PrintEDID(xf86DoEDID_DDC1( pScrn->scrnIndex,vgaHWddc1SetSpeed,pSiS->ddc1Read )));