xf86-video-r128: Branch 'master'

[Dave Airlie]

 src/r128_driver.c |    2 +-
 src/r128_probe.c  |    6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit d519ef9adca6e60bbafbc5649f1bafef43cebb4e
Author: Dave Airlie <airlied at redhat.com>
Date:   Tue Jul 28 15:22:41 2009 +1000

    r128: change to using ABI version check

diff --git a/src/r128_driver.c b/src/r128_driver.c
index a4a5cea..d6448b6 100644
--- a/src/r128_driver.c
+++ b/src/r128_driver.c
@@ -87,7 +87,7 @@
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86PciInfo.h"
-#ifndef XSERVER_LIBPCIACCESS
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
 #include "xf86RAC.h"
 #include "xf86Resources.h"
 #endif
diff --git a/src/r128_probe.c b/src/r128_probe.c
index c61da4c..412da92 100644
--- a/src/r128_probe.c
+++ b/src/r128_probe.c
@@ -46,8 +46,12 @@
 #include "xf86.h"
 #include "xf86PciInfo.h"
 
-#ifndef XSERVER_LIBPCIACCESS
+
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
 #include "xf86Resources.h"
+#endif
+
+#ifndef XSERVER_LIBPCIACCESS
 static Bool R128Probe(DriverPtr drv, int flags);
 #endif