xf86-video-ati: Branch 'master'

[Dave Airlie]

 src/radeon_driver.c |    2 +-
 src/radeon_probe.c  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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

    ati: change to using ABI version check

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 46c6451..979b1ad 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -93,7 +93,7 @@
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86RandR12.h"
-#ifndef XSERVER_LIBPCIACCESS
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
 #include "xf86RAC.h"
 #include "xf86Resources.h"
 #endif
diff --git a/src/radeon_probe.c b/src/radeon_probe.c
index d9f92fa..42e7259 100644
--- a/src/radeon_probe.c
+++ b/src/radeon_probe.c
@@ -45,7 +45,7 @@
 #include "atipcirename.h"
 
 #include "xf86.h"
-#ifndef XSERVER_LIBPCIACCESS
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
 #include "xf86Resources.h"
 #endif