xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/drmmode_display.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 0f184630cd4760199430320215e4280438fc4ce5
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Tue Oct 19 17:13:06 2010 -0400

    radeon: fix compilation on xserver >= 1.10
    
    Fixes:
    https://bugs.freedesktop.org/show_bug.cgi?id=30451
    
    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>

diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index baadec1..37010cd 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -1149,10 +1149,9 @@ drmmode_xf86crtc_resize (ScrnInfoPtr scrn, int width, int height)
 					   width, height, -1, -1, pitch * cpp,
 					   info->fb_shadow);
 	}
+#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,9,99,1,0)
 	scrn->pixmapPrivate.ptr = ppix->devPrivate.ptr;
-
-	//	xf86DrvMsg(scrn->scrnIndex, X_INFO, "New front buffer at 0x%lx\n",
-	//		   info->front_bo-);
+#endif
 
 	for (i = 0; i < xf86_config->num_crtc; i++) {
 		xf86CrtcPtr crtc = xf86_config->crtc[i];