Fix merge issues that broke the build on i386. Reported by dan mclaughlin

and others.

driver/xf86-video-mach64/src/atipreinit.c

@@ -59,8 +59,8 @@
 /*
  * FreeScreen handles the clean-up.
  */
-Bool
-ATIGetRec(ScrnInfoPtr pScrn)
+static Bool
+Mach64GetRec(ScrnInfoPtr pScrn)
 {
     if (!pScrn->driverPrivate) {
         pScrn->driverPrivate = xnfcalloc(sizeof(ATIRec), 1);
@@ -543,7 +543,7 @@ ATIPreInit
         return FALSE;
     }
 
-    if (!ATIGetRec(pScreenInfo))
+    if (!Mach64GetRec(pScreenInfo))
         return FALSE;
 
     pATI = ATIPTR(pScreenInfo);
@@ -556,9 +556,7 @@ ATIPreInit
 #endif
 
     pATI->iEntity = pEntity->index;
-#ifndef XSERVER_LIBPCIACCESS
     pATI->Chip = pEntity->chipset;
-#endif
     pVideo = xf86GetPciInfoForEntity(pATI->iEntity);
 
     free(pEntity);
@@ -700,7 +698,6 @@ ATIPreInit
 #else
     pATI->pVBE = pVBE;
     pVBE = NULL;
-    pInt10Info = NULL;
 #endif /* TV_OUT */
 
     if (ConfiguredMonitor && !(flags & PROBE_DETECT))