geode: update for resources/RAC API removal

7 files changed, 14 insertions, 9 deletions

diff --git a/src/geode_dcon.c b/src/geode_dcon.c
index 11df94b..9982671 100644
--- a/src/geode_dcon.c
+++ b/src/geode_dcon.c
@@ -30,7 +30,6 @@
 /* Includes that are used by all drivers */
 #include <xf86.h>
 #include <xf86_OSproc.h>
-#include <xf86Resources.h>
 #include <compiler.h>
 
 #include "geode.h"
diff --git a/src/geode_driver.c b/src/geode_driver.c
index 4c7239e..bc9c3dd 100644
--- a/src/geode_driver.c
+++ b/src/geode_driver.c
@@ -42,7 +42,9 @@
 /* Includes that are used by all drivers */
 #include "xf86.h"
 #include "xf86_OSproc.h"
+#ifndef XSERVER_LIBPCIACCESS
 #include "xf86Resources.h"
+#endif
 #include "compiler.h"
 #include "xf86PciInfo.h"
 #include "xf86Pci.h"
diff --git a/src/gx_driver.c b/src/gx_driver.c
index b713897..edc5045 100644
--- a/src/gx_driver.c
+++ b/src/gx_driver.c
@@ -35,7 +35,9 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
+#ifndef XSERVER_LIBPCIACCESS
 #include "xf86Resources.h"
+#endif
 #include "xf86cmap.h"
 #include "compiler.h"
 #include "mipointer.h"
@@ -419,8 +421,10 @@ GXPreInit(ScrnInfoPtr pScrni, int flags)
 	return FALSE;
 
     pEnt = xf86GetEntityInfo(pScrni->entityList[0]);
+#ifndef XSERVER_LIBPCIACCESS
     if (pEnt->resources)
 	return FALSE;
+#endif
 
     pGeode = pScrni->driverPrivate = xnfcalloc(sizeof(GeodeRec), 1);
 
@@ -704,12 +708,13 @@ GXPreInit(ScrnInfoPtr pScrni, int flags)
 	}
     }
 
+#ifndef XSERVER_LIBPCIACCESS
     if (xf86RegisterResources(pGeode->pEnt->index, NULL, ResExclusive)) {
 	xf86DrvMsg(pScrni->scrnIndex, X_ERROR,
 	    "Couldn't register the resources.\n");
 	return FALSE;
     }
-
+#endif
     return TRUE;
 }
 
diff --git a/src/gx_video.c b/src/gx_video.c
index 354e179..9041f5f 100644
--- a/src/gx_video.c
+++ b/src/gx_video.c
@@ -45,7 +45,6 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86Resources.h"
 #include "compiler.h"
 #include "xf86PciInfo.h"
 #include "xf86Pci.h"
diff --git a/src/lx_driver.c b/src/lx_driver.c
index 107b354..a78778a 100644
--- a/src/lx_driver.c
+++ b/src/lx_driver.c
@@ -36,7 +36,9 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
+#ifndef XSERVER_LIBPCIACCESS
 #include "xf86Resources.h"
+#endif
 #include "xf86i2c.h"
 #include "xf86Crtc.h"
 #include "xf86cmap.h"
@@ -289,10 +291,10 @@ LXPreInit(ScrnInfoPtr pScrni, int flags)
 	return FALSE;
 
     pEnt = xf86GetEntityInfo(pScrni->entityList[0]);
-
+#ifndef XSERVER_LIBPCIACCESS
     if (pEnt->resources)
 	return FALSE;
-
+#endif
     if (flags & PROBE_DETECT) {
 	GeodeProbeDDC(pScrni, pEnt->index);
 	return TRUE;
@@ -570,13 +572,13 @@ LXPreInit(ScrnInfoPtr pScrni, int flags)
 	if (!xf86LoadSubModule(pScrni, "exa"))
 	    return FALSE;
     }
-
+#ifndef XSERVER_LIBPCIACCESS
     if (xf86RegisterResources(pGeode->pEnt->index, NULL, ResExclusive)) {
 	xf86DrvMsg(pScrni->scrnIndex, X_ERROR,
 	    "Couldn't register the resources.\n");
 	return FALSE;
     }
-
+#endif
     return TRUE;
 }
 
diff --git a/src/lx_video.c b/src/lx_video.c
index 01ccba7..702139e 100644
--- a/src/lx_video.c
+++ b/src/lx_video.c
@@ -38,7 +38,6 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86Resources.h"
 #include "compiler.h"
 #include "xf86PciInfo.h"
 #include "xf86Pci.h"
diff --git a/src/z4l.c b/src/z4l.c
index 4877b89..3935962 100644
--- a/src/z4l.c
+++ b/src/z4l.c
@@ -43,7 +43,6 @@
 #include "xf86.h"
 #include <X11/extensions/Xv.h>
 #include "xf86_OSproc.h"
-#include "xf86Resources.h"
 #include "compiler.h"
 #include "xf86xv.h"
 #include "fourcc.h"