summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2009-07-28 15:22:40 +1000
committerDave Airlie <airlied@redhat.com>2009-09-10 12:59:12 +1000
commit1c09cdd8d23c6f79640b5b653e799089798eea2a (patch)
tree51007a8023d4cb8303c963eb80a1dbe8865a47fa
parent034b6d057cd62ce60961d4f7b3fa4e9eb35c9626 (diff)
ati: change to using ABI version check
(cherry picked from commit 63c873cbd4d1d21d9f688028c0900c79fadc42c1)
-rw-r--r--src/radeon_driver.c2
-rw-r--r--src/radeon_probe.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 94886669..9d8bd39c 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 234d2929..d5f9a141 100644
--- a/src/radeon_probe.c
+++ b/src/radeon_probe.c
@@ -44,7 +44,7 @@
#include "atipcirename.h"
#include "xf86.h"
-#ifndef XSERVER_LIBPCIACCESS
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
#include "xf86Resources.h"
#endif