xf86-video-ati: Branch 'master'

[Michel Dänzer]

 src/drmmode_display.c |    8 --------
 1 file changed, 8 deletions(-)

New commits:
commit dbac18c361f9e514ecb40d0617f9d68b65a542e0
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Mon Apr 28 17:51:56 2014 +0900

    Revert "Adapt to load_cursor_argb signature change in xserver 1.15.99.902"
    
    This reverts commit 48d3dbc8a0d3bfde88f46e402e530438f9317715.
    
    xserver Git has been updated to be backwards compatible with the
    previous API.

diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index fc99128..02bdf9e 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -590,11 +590,7 @@ drmmode_set_cursor_position (xf86CrtcPtr crtc, int x, int y)
 	drmModeMoveCursor(drmmode->fd, drmmode_crtc->mode_crtc->crtc_id, x, y);
 }
 
-#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,15,99,902,0)
-static Bool
-#else
 static void
-#endif
 drmmode_load_cursor_argb (xf86CrtcPtr crtc, CARD32 *image)
 {
 	ScrnInfoPtr pScrn = crtc->scrn;
@@ -609,10 +605,6 @@ drmmode_load_cursor_argb (xf86CrtcPtr crtc, CARD32 *image)
 
 	for (i = 0; i < cursor_size; i++)
 		ptr[i] = cpu_to_le32(image[i]);
-
-#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,15,99,902,0)
-	return TRUE;
-#endif
 }