xf86-video-ati: Branch 'master'

[Michel Dänzer]

 configure.ac      |    6 +++---
 src/radeon_sync.c |    7 ++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

New commits:
commit af1862a37570fa512a525ab47d72b30400d2e2d6
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Wed Mar 18 11:05:40 2015 +0900

    Always include misync.h before other misync headers
    
    Older versions of xserver didn't include misync.h from other misync
    headers as needed.

diff --git a/configure.ac b/configure.ac
index acd9fe0..0468aeb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -131,11 +131,11 @@ AC_CHECK_DECL(xorg_list_init,
 	      #include "xorg-server.h"
 	      #include "list.h"])
 
-AC_CHECK_HEADERS([misyncshm.h], [], [],
+AC_CHECK_HEADERS([misync.h], [], [],
                  [#include <X11/Xdefs.h>
 	          #include <X11/Xfuncproto.h>
-	          #include "screenint.h"
-	          #include "xorg-server.h"])
+	          #include <xorg-server.h>
+	          #include <pixmap.h>])
 
 AC_CHECK_HEADERS([present.h], [], [],
 		 [#include <X11/Xmd.h>
diff --git a/src/radeon_sync.c b/src/radeon_sync.c
index d8ab5bc..659c165 100644
--- a/src/radeon_sync.c
+++ b/src/radeon_sync.c
@@ -23,8 +23,9 @@
 
 #include "radeon.h"
 
-#ifdef HAVE_MISYNCSHM_H
+#ifdef HAVE_MISYNC_H
 
+#include "misync.h"
 #include "misyncshm.h"
 #include "misyncstr.h"
 
@@ -124,13 +125,13 @@ radeon_sync_close(ScreenPtr screen)
 	info->CreateFence = NULL;
 }
 
-#else /* !HAVE_MISYNCSHM_H */
+#else /* !HAVE_MISYNC_H */
 
 Bool
 radeon_sync_init(ScreenPtr screen)
 {
 	xf86DrvMsg(xf86ScreenToScrn(screen)->scrnIndex, X_INFO,
-		   "SYNC extension fences disabled because misyncshm.h not "
+		   "SYNC extension fences disabled because misync.h not "
 		   "available at build time\n");
 
 	return FALSE;