xf86-video-r128: Branch 'master'

[Dave Airlie]

 src/r128_driver.c |    4 ++++
 src/r128_probe.c  |    2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit e3568b4e5d404076c0f02c1b64af35c8e6d5745f
Author: Dave Airlie <airlied at redhat.com>
Date:   Tue Jul 28 13:32:32 2009 +1000

    r128: update for resources/RAC API removal

diff --git a/src/r128_driver.c b/src/r128_driver.c
index 90e2246..a4a5cea 100644
--- a/src/r128_driver.c
+++ b/src/r128_driver.c
@@ -87,8 +87,10 @@
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86PciInfo.h"
+#ifndef XSERVER_LIBPCIACCESS
 #include "xf86RAC.h"
 #include "xf86Resources.h"
+#endif
 #include "xf86cmap.h"
 #include "xf86xv.h"
 #include "vbe.h"
@@ -1980,10 +1982,12 @@ Bool R128PreInit(ScrnInfoPtr pScrn, int flags)
 	       PCI_DEV_DEV(info->PciInfo),
 	       PCI_DEV_FUNC(info->PciInfo));
 
+#ifndef XSERVER_LIBPCIACCESS
     if (xf86RegisterResources(info->pEnt->index, 0, ResNone)) goto fail;
     if (xf86SetOperatingState(resVga, info->pEnt->index, ResUnusedOpr)) goto fail;
 
     pScrn->racMemFlags = RAC_FB | RAC_COLORMAP | RAC_VIEWPORT | RAC_CURSOR;
+#endif
     pScrn->monitor     = pScrn->confScreen->monitor;
 
     if (!R128PreInitVisual(pScrn))    goto fail;
diff --git a/src/r128_probe.c b/src/r128_probe.c
index bfec1eb..c61da4c 100644
--- a/src/r128_probe.c
+++ b/src/r128_probe.c
@@ -45,9 +45,9 @@
 
 #include "xf86.h"
 #include "xf86PciInfo.h"
-#include "xf86Resources.h"
 
 #ifndef XSERVER_LIBPCIACCESS
+#include "xf86Resources.h"
 static Bool R128Probe(DriverPtr drv, int flags);
 #endif