i128: update for resources/RAC API removal

2 files changed, 6 insertions, 2 deletions

diff --git a/src/i128.h b/src/i128.h
index db647da..f652e7c 100644
--- a/src/i128.h
+++ b/src/i128.h
@@ -38,8 +38,8 @@ typedef struct {
     pciVideoPtr		PciInfo;
 #ifndef XSERVER_LIBPCIACCESS
     PCITAG		PciTag;
-#endif
     xf86AccessRec	Access;
+#endif
     int			Chipset;
     int                 ChipRev;
     Bool		Primary;
diff --git a/src/i128_driver.c b/src/i128_driver.c
index 9de7527..a9c83d4 100644
--- a/src/i128_driver.c
+++ b/src/i128_driver.c
@@ -31,7 +31,10 @@
 /* All drivers should typically include these */
 #include "xf86.h"
 #include "xf86_OSproc.h"
+#ifndef XSERVER_LIBPCIACCESS
 #include "xf86Resources.h"
+#include "xf86RAC.h"
+#endif
 
 #include "compiler.h"
 
@@ -52,7 +55,6 @@
 #include "micmap.h"
 
 #include "xf86DDC.h"
-#include "xf86RAC.h"
 #include "vbe.h"
 
 #include "xaa.h"
@@ -723,12 +725,14 @@ I128PreInit(ScrnInfoPtr pScrn, int flags)
     xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "MMIO registers at 0x%lX\n",
 	       (unsigned long)PCI_REGION_BASE(pI128->PciInfo, 5, REGION_IO));
 
+#ifndef XSERVER_LIBPCIACCESS
     if (xf86RegisterResources(pI128->pEnt->index, NULL, ResExclusive)) {
 	xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
 		"xf86RegisterResources() found resource conflicts\n");
 	I128FreeRec(pScrn);
 	return FALSE;
     }
+#endif
 
     /* HW bpp matches reported bpp */
     pI128->bitsPerPixel = pScrn->bitsPerPixel;