[devel-fix_static_build_viaFillGraphicInfo] Move viaFillGraphicInfo outside

    of #ifdef XFree86LOADER.

1 files changed, 53 insertions, 53 deletions

diff --git a/src/via_driver.c b/src/via_driver.c
index 6be2509..c12bbcf 100644
--- a/src/via_driver.c
+++ b/src/via_driver.c
@@ -340,59 +340,6 @@ static XF86ModuleVersionInfo VIAVersRec = {
 
 XF86ModuleData viaModuleData = {&VIAVersRec, VIASetup, NULL};
 
-static void 
-viaFillGraphicInfo(ScrnInfoPtr pScrn)
-{
-    VIAPtr pVia = VIAPTR(pScrn);
-    VIABIOSInfoPtr pBIOSInfo = pVia->pBIOSInfo;
-    LPVIAGRAPHICINFO graphicInfo = &(pVia->graphicInfo);
-    LPSCREENINFO Screen;
-
-    DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "viaFillGraphicInfo\n"));
-
-    if (pVia->IsSecondary) {
-	/* So far we have only used this when !pVia->IsSecondary */
-	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Using viaFillGraphicInfo on secondary screen.\n");
-	Screen = &(graphicInfo->Screen[1]);
-    } else
-	Screen = &(graphicInfo->Screen[0]);
-
-    Screen->TotalVRAM = pVia->videoRambytes;
-    Screen->VideoHeapBase = (unsigned long) pVia->FBFreeStart;
-    Screen->VideoHeapEnd = (unsigned long) (pVia->FBFreeEnd - 1);
-    Screen->dwWidth = pBIOSInfo->CrtcHDisplay;
-    Screen->dwHeight = pBIOSInfo->CrtcVDisplay;
-    Screen->dwSaveWidth = pBIOSInfo->SaveHDisplay;
-    Screen->dwSaveHeight = pBIOSInfo->SaveVDisplay;
-    Screen->dwBPP = pScrn->bitsPerPixel;
-    Screen->dwPitch = (((pScrn->virtualX) + 15) & ~15) * (pScrn->bitsPerPixel) / 8;
-    Screen->dwRefreshRate = (unsigned long)pBIOSInfo->FoundRefresh;
-    Screen->dwDVIOn = pBIOSInfo->DVIAttach;
-    Screen->dwLCDOn = pBIOSInfo->LCDAttach;
-
-    if (pBIOSInfo->SaveHDisplay > pBIOSInfo->CrtcHDisplay)
-        Screen->dwPanning = 1;
-    else
-        Screen->dwPanning = 0;
-
-    Screen->dwExpand = pBIOSInfo->scaleY;
-    Screen->dwPanelWidth = pBIOSInfo->panelX;
-    Screen->dwPanelHeight = pBIOSInfo->panelY;
-    Screen->dwActiveDevice = pBIOSInfo->ActiveDevice;
-
-    graphicInfo->RevisionID = pVia->ChipRev;
-    graphicInfo->dwDeviceID = pVia->ChipId;
-    graphicInfo->SAMM = pBIOSInfo->SAMM;
-    graphicInfo->dwActiveDevice = pVia->ActiveDevice;
-
-    /* Added to pass DRM info to V4L */
-#ifdef XF86DRI
-    graphicInfo->DRMEnabled = pVia->directRenderingEnabled;
-#else
-    graphicInfo->DRMEnabled = 0;
-#endif
-}
-
 static pointer VIASetup(pointer module, pointer opts, int *errmaj, int *errmin)
 {
     static Bool setupDone = FALSE;
@@ -2200,6 +2147,59 @@ static void VIAUnmapMem(ScrnInfoPtr pScrn)
  * until thomas his xvmc is used by whatever is using ddmpeg now. But at
  * least this is a bit nicer than the previous.
  */
+static void 
+viaFillGraphicInfo(ScrnInfoPtr pScrn)
+{
+    VIAPtr pVia = VIAPTR(pScrn);
+    VIABIOSInfoPtr pBIOSInfo = pVia->pBIOSInfo;
+    LPVIAGRAPHICINFO graphicInfo = &(pVia->graphicInfo);
+    LPSCREENINFO Screen;
+
+    DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "viaFillGraphicInfo\n"));
+
+    if (pVia->IsSecondary) {
+	/* So far we have only used this when !pVia->IsSecondary */
+	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Using viaFillGraphicInfo on secondary screen.\n");
+	Screen = &(graphicInfo->Screen[1]);
+    } else
+	Screen = &(graphicInfo->Screen[0]);
+
+    Screen->TotalVRAM = pVia->videoRambytes;
+    Screen->VideoHeapBase = (unsigned long) pVia->FBFreeStart;
+    Screen->VideoHeapEnd = (unsigned long) (pVia->FBFreeEnd - 1);
+    Screen->dwWidth = pBIOSInfo->CrtcHDisplay;
+    Screen->dwHeight = pBIOSInfo->CrtcVDisplay;
+    Screen->dwSaveWidth = pBIOSInfo->SaveHDisplay;
+    Screen->dwSaveHeight = pBIOSInfo->SaveVDisplay;
+    Screen->dwBPP = pScrn->bitsPerPixel;
+    Screen->dwPitch = (((pScrn->virtualX) + 15) & ~15) * (pScrn->bitsPerPixel) / 8;
+    Screen->dwRefreshRate = (unsigned long)pBIOSInfo->FoundRefresh;
+    Screen->dwDVIOn = pBIOSInfo->DVIAttach;
+    Screen->dwLCDOn = pBIOSInfo->LCDAttach;
+
+    if (pBIOSInfo->SaveHDisplay > pBIOSInfo->CrtcHDisplay)
+        Screen->dwPanning = 1;
+    else
+        Screen->dwPanning = 0;
+
+    Screen->dwExpand = pBIOSInfo->scaleY;
+    Screen->dwPanelWidth = pBIOSInfo->panelX;
+    Screen->dwPanelHeight = pBIOSInfo->panelY;
+    Screen->dwActiveDevice = pBIOSInfo->ActiveDevice;
+
+    graphicInfo->RevisionID = pVia->ChipRev;
+    graphicInfo->dwDeviceID = pVia->ChipId;
+    graphicInfo->SAMM = pBIOSInfo->SAMM;
+    graphicInfo->dwActiveDevice = pVia->ActiveDevice;
+
+    /* Added to pass DRM info to V4L */
+#ifdef XF86DRI
+    graphicInfo->DRMEnabled = pVia->directRenderingEnabled;
+#else
+    graphicInfo->DRMEnabled = 0;
+#endif
+}
+
 static Bool 
 viaInitV4L(ScrnInfoPtr pScrn)
 {