From 9c5bd06addbd5470c891760b1ba84c27eddeecad Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Tue, 11 Mar 2008 10:50:32 +1000
Subject: further build fixes

---
 src/apm.h        | 2 +-
 src/apm_driver.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/apm.h b/src/apm.h
index 1f616eb..97b02ac 100644
--- a/src/apm.h
+++ b/src/apm.h
@@ -128,7 +128,7 @@ typedef struct {
     unsigned char	savedSR10;
     CARD8		MiscOut;
     CARD8		c9, d9, db, Rush;
-    unsigned long	saveCmd;
+    unsigned int	saveCmd;
     pointer		FontInfo;
     Bool		hwCursor;
     Bool		noLinear;
diff --git a/src/apm_driver.c b/src/apm_driver.c
index b5b5874..9e4603a 100644
--- a/src/apm_driver.c
+++ b/src/apm_driver.c
@@ -415,9 +415,11 @@ ApmProbe(DriverPtr drv, int flags)
      * file info to override any contradictions.
      */
 
+#ifndef XSERVER_LIBPCIACCESS
     if (xf86GetPciVideoInfo() == NULL) {
 	return FALSE;
     }
+#endif
     numUsed = xf86MatchPciInstances(APM_NAME, PCI_VENDOR_ALLIANCE,
 		    ApmChipsets, ApmPciChipsets, DevSections, numDevSections,
 		    drv, &usedChips);
@@ -1928,8 +1930,10 @@ ApmScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
     if (pApm->noLinear) {
 	PCI_READ_LONG(pApm->PciInfo, &pApm->saveCmd, PCI_CMD_STAT_REG);
 	PCI_WRITE_LONG(pApm->PciInfo, pApm->saveCmd | (PCI_CMD_IO_ENABLE | PCI_CMD_MEM_ENABLE), PCI_CMD_STAT_REG);
+#ifndef XSERVER_LIBPCIACCESS
 	pApm->FbBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER,
 				 pApm->PciTag, 0xA0000, 0x10000);
+#endif
     }
     else
 	if (!ApmMapMem(pScrn))
-- 
cgit v1.2.3