xf86-video-ati: Branch 'master'

[Michel Dänzer]

 src/radeon_dri3.c    |    5 +----
 src/radeon_present.c |   13 +------------
 2 files changed, 2 insertions(+), 16 deletions(-)

New commits:
commit 694e04720b886060fe3eefdce59741f218c8269f
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Tue Mar 17 16:32:09 2015 +0900

    Simplify includes in radeon_{dri3,present}.c
    
    Just include radeon.h first. Fixes build failures against older versions
    of xserver because compat-api.h wasn't getting picked up. Reported by
    "Pali" on IRC.

diff --git a/src/radeon_dri3.c b/src/radeon_dri3.c
index 83bffae..1413a62 100644
--- a/src/radeon_dri3.c
+++ b/src/radeon_dri3.c
@@ -26,13 +26,10 @@
 #include "config.h"
 #endif
 
-#include "xorg-server.h"
-#include "xf86.h"
-#include "fb.h"
+#include "radeon.h"
 
 #ifdef HAVE_DRI3_H
 
-#include "radeon.h"
 #include "radeon_bo_gem.h"
 #include "radeon_glamor.h"
 #include "dri3.h"
diff --git a/src/radeon_present.c b/src/radeon_present.c
index d884548..0aa96cf 100644
--- a/src/radeon_present.c
+++ b/src/radeon_present.c
@@ -25,8 +25,7 @@
 #include "config.h"
 #endif
 
-#include <xorg-server.h>
-#include <xf86.h>
+#include "radeon.h"
 
 #ifdef HAVE_PRESENT_H
 
@@ -43,16 +42,6 @@
 #include <time.h>
 #include <errno.h>
 
-#include "xf86_OSproc.h"
-
-#include "xf86Pci.h"
-#include "xf86drm.h"
-
-#include "windowstr.h"
-#include "shadow.h"
-#include "fb.h"
-
-#include "radeon.h"
 #include "radeon_video.h"
 
 #include "present.h"