From 85b5ff3fdf3141ef01604bd7eb8e71e30d24717f Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Tue, 28 Jul 2009 15:22:40 +1000 Subject: nv: change to using ABI version check --- src/g80_driver.c | 2 +- src/nv_include.h | 2 +- src/riva_include.h | 2 +- 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 #include -#ifndef XSERVER_LIBPCIACCESS +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 #include #endif #include 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 -- cgit v1.2.3