xf86-video-mach64: Branch 'master'

[Dave Airlie]

 src/atipreinit.c |    2 +-
 src/atistruct.h  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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

    mach64: change to using ABI version check

diff --git a/src/atipreinit.c b/src/atipreinit.c
index 6c742fd..34b851c 100644
--- a/src/atipreinit.c
+++ b/src/atipreinit.c
@@ -52,7 +52,7 @@
 #include "atixv.h"
 
 #include "vbe.h"
-#ifndef XSERVER_LIBPCIACCESS
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
 #include "xf86RAC.h"
 #endif
 
diff --git a/src/atistruct.h b/src/atistruct.h
index ac76b1f..5225256 100644
--- a/src/atistruct.h
+++ b/src/atistruct.h
@@ -59,7 +59,7 @@
 #endif
 #include "xf86Cursor.h"
 #include "xf86Pci.h"
-#ifndef XSERVER_LIBPCIACCESS
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
 #include "xf86Resources.h"
 #endif