summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2009-07-28 15:22:40 +1000
committerDave Airlie <airlied@redhat.com>2009-07-28 15:22:40 +1000
commit85b5ff3fdf3141ef01604bd7eb8e71e30d24717f (patch)
tree24a43ca94b274a53c4581c2a3e59c723765c3cbe
parent445498d2cc977b8c4f22fca881c75637dc7b058a (diff)
nv: change to using ABI version check
-rw-r--r--src/g80_driver.c2
-rw-r--r--src/nv_include.h2
-rw-r--r--src/riva_include.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/g80_driver.c b/src/g80_driver.c
index 17c85f0..9cc2bf2 100644
--- a/src/g80_driver.c
+++ b/src/g80_driver.c
@@ -29,7 +29,7 @@
#include <string.h>
#include <xf86_OSproc.h>
-#ifndef XSERVER_LIBPCIACCESS
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
#include <xf86Resources.h>
#endif
#include <mipointer.h>
diff --git a/src/nv_include.h b/src/nv_include.h
index 4442621..a0d5ad1 100644
--- a/src/nv_include.h
+++ b/src/nv_include.h
@@ -9,7 +9,7 @@
#include "xf86.h"
#include "xf86_OSproc.h"
-#ifndef XSERVER_LIBPCIACCESS
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
#include "xf86Resources.h"
#include "xf86RAC.h"
#endif
diff --git a/src/riva_include.h b/src/riva_include.h
index a2064e1..04c35a6 100644
--- a/src/riva_include.h
+++ b/src/riva_include.h
@@ -7,7 +7,7 @@
#include "xf86.h"
#include "xf86_OSproc.h"
-#ifndef XSERVER_LIBPCIACCESS
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
#include "xf86Resources.h"
#include "xf86RAC.h"
#endif