3 files changed, 9 insertions, 2 deletions
diff --git a/src/savage_driver.c b/src/savage_driver.c
index 3ce0d73..e49c8c2 100644
--- a/src/savage_driver.c
+++ b/src/savage_driver.c
@@ -42,7 +42,9 @@
 #include <unistd.h>
 #include <errno.h>
 
+#ifndef XSERVER_LIBPCIACCESS
 #include "xf86RAC.h"
+#endif
 #include "shadowfb.h"
 
 #include "globals.h"
@@ -680,7 +682,7 @@ static Bool SavagePciProbe(DriverPtr drv, int entity_num,
     }
 
     pScrn = xf86ConfigPciEntity(NULL, 0, entity_num, NULL,
-				RES_SHARED_VGA, NULL, NULL, NULL, NULL);
+				NULL, NULL, NULL, NULL, NULL);
     if (pScrn != NULL) {
 	EntityInfoPtr pEnt;
 	SavagePtr psav;
@@ -1393,20 +1395,24 @@ static Bool SavagePreInit(ScrnInfoPtr pScrn, int flags)
     }
 
     pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
+#ifndef XSERVER_LIBPCIACCESS
     if (pEnt->resources) {
 	xfree(pEnt);
 	SavageFreeRec(pScrn);
 	return FALSE;
     }
+#endif
     psav->EntityIndex = pEnt->index;
 
     if (xf86LoadSubModule(pScrn, "vbe")) {
 	psav->pVbe = VBEInit(NULL, pEnt->index);
     }
 
+#ifndef XSERVER_LIBPCIACCESS
     xf86RegisterResources(pEnt->index, NULL, ResNone);
     xf86SetOperatingState(resVgaIo, pEnt->index, ResUnusedOpr);
     xf86SetOperatingState(resVgaMem, pEnt->index, ResDisableOpr);
+#endif
 
     from = X_DEFAULT;
     if (pEnt->device->chipset && *pEnt->device->chipset) {
diff --git a/src/savage_driver.h b/src/savage_driver.h
index c47b472..34dfced 100644
--- a/src/savage_driver.h
+++ b/src/savage_driver.h
@@ -51,7 +51,9 @@
 #include "compiler.h"
 #include "vgaHW.h"
 #include "xf86.h"
+#ifndef XSERVER_LIBPCIACCESS
 #include "xf86Resources.h"
+#endif
 #include "xf86Pci.h"
 #include "xf86PciInfo.h"
 #include "xf86_OSproc.h"
diff --git a/src/savage_hwmc.c b/src/savage_hwmc.c
index 43c9dfd..abfe805 100644
--- a/src/savage_hwmc.c
+++ b/src/savage_hwmc.c
@@ -28,7 +28,6 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86Resources.h"
 #include "compiler.h"
 #include "xf86PciInfo.h"
 #include "xf86Pci.h"