From 2765aba56fe66038ab7de554474b8d30995f3ef0 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Tue, 28 Jul 2009 13:32:29 +1000
Subject: cirrus: update for resources/RAC API removal

---
 src/alp_driver.c | 6 +++++-
 src/cir_driver.c | 3 ++-
 src/cir_shadow.c | 1 -
 src/lg_driver.c  | 5 ++++-
 4 files changed, 11 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/alp_driver.c b/src/alp_driver.c
index a14a5e8..c5c531d 100644
--- a/src/alp_driver.c
+++ b/src/alp_driver.c
@@ -36,8 +36,10 @@
 /* This driver needs to be modified to not use vgaHW for multihead operation */
 #include "vgaHW.h"
 
+#ifndef XSERVER_LIBPCIACCESS
 #include "xf86RAC.h"
 #include "xf86Resources.h"
+#endif
 
 /* All drivers initialising the SW cursor need this */
 #include "mipointer.h"
@@ -695,7 +697,8 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
  			(unsigned long)pCir->IOAddress);
  	} else 
  	    xf86DrvMsg(pScrn->scrnIndex, from1, "Not Using MMIO\n");
-     
+
+#ifndef XSERVER_LIBPCIACCESS
      /*
       * XXX Check if this is correct
       */
@@ -712,6 +715,7 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
 		    "xf86RegisterResources() found resource conflicts\n");
 	 return FALSE;
      }
+#endif
 
      if (!xf86LoadSubModule(pScrn, "i2c")) {
 	 AlpFreeRec(pScrn);
diff --git a/src/cir_driver.c b/src/cir_driver.c
index 4cdce94..758e2fb 100644
--- a/src/cir_driver.c
+++ b/src/cir_driver.c
@@ -21,8 +21,9 @@
 #include "xf86.h"
 #include "xf86_OSproc.h"
 
+#ifndef XSERVER_LIBPCIACCESS
 #include "xf86Resources.h"
-
+#endif
 /* All drivers need this */
 
 /* Drivers for PCI hardware need this */
diff --git a/src/cir_shadow.c b/src/cir_shadow.c
index e8b8d35..b89890a 100644
--- a/src/cir_shadow.c
+++ b/src/cir_shadow.c
@@ -11,7 +11,6 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86Resources.h"
 #include "xf86PciInfo.h"
 #include "xf86Pci.h"
 #include "shadowfb.h"
diff --git a/src/lg_driver.c b/src/lg_driver.c
index 2574472..9d0850b 100644
--- a/src/lg_driver.c
+++ b/src/lg_driver.c
@@ -39,8 +39,10 @@
 /* This driver needs to be modified to not use vgaHW for multihead operation */
 #include "vgaHW.h"
 
+#ifndef XSERVER_LIBPCIACCESS
 #include "xf86RAC.h"
 #include "xf86Resources.h"
+#endif
 
 /* All drivers initialising the SW cursor need this */
 #include "mipointer.h"
@@ -571,6 +573,7 @@ LgPreInit(ScrnInfoPtr pScrn, int flags)
 	pCir->FbMapSize = pScrn->videoRam * 1024;
 	pCir->IoMapSize = 0x4000;	/* 16K for moment,  will increase */
 
+#ifndef XSERVER_LIBPCIACCESS
 	pScrn->racIoFlags =   RAC_COLORMAP 
 #ifndef EXPERIMENTAL
 	  | RAC_VIEWPORT
@@ -584,7 +587,7 @@ LgPreInit(ScrnInfoPtr pScrn, int flags)
 			"xf86RegisterResources() found resource conflicts\n");
 		return FALSE;
 	}
-
+#endif
 	if (!xf86LoadSubModule(pScrn, "ddc")) {
 		LgFreeRec(pScrn);
 		return FALSE;
-- 
cgit v1.2.3