xf86-video-ati: Branch 'master'

[Michel Dänzer]

 src/radeon_sync.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit af6076241c0d322b295a4e898407ae2472bd8eb4
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Tue Mar 24 13:37:01 2015 +0900

    Adapt radeon_sync.c for misyncshm.h vs misync.h as well
    
    This should have been part of the previous commit. Without this, SYNC
    extension fences (and by extension DRI3) were disabled because it checked
    for HAVE_MISYNC_H, but configure now only defines HAVE_MISYNCSHM_H.

diff --git a/src/radeon_sync.c b/src/radeon_sync.c
index 659c165..d9ffbaf 100644
--- a/src/radeon_sync.c
+++ b/src/radeon_sync.c
@@ -23,7 +23,7 @@
 
 #include "radeon.h"
 
-#ifdef HAVE_MISYNC_H
+#ifdef HAVE_MISYNCSHM_H
 
 #include "misync.h"
 #include "misyncshm.h"
@@ -125,13 +125,13 @@ radeon_sync_close(ScreenPtr screen)
 	info->CreateFence = NULL;
 }
 
-#else /* !HAVE_MISYNC_H */
+#else /* !HAVE_MISYNCSHM_H */
 
 Bool
 radeon_sync_init(ScreenPtr screen)
 {
 	xf86DrvMsg(xf86ScreenToScrn(screen)->scrnIndex, X_INFO,
-		   "SYNC extension fences disabled because misync.h not "
+		   "SYNC extension fences disabled because misyncshm.h not "
 		   "available at build time\n");
 
 	return FALSE;