xf86-video-ati: Branch 'master'

[Michel Dänzer]

 src/drmmode_display.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit e372f845b0defaf2d2c9ef3cbbf7498e09d9372e
Author: Michel Dänzer <daenzer at vmware.com>
Date:   Sun Jul 19 16:05:29 2009 +0200

    Guard reference to CRTC active field.
    
    Fixes build against older xserver.

diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 42b0b15..3f4ccfc 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -323,8 +323,11 @@ done:
 		crtc->y = saved_y;
 		crtc->rotation = saved_rotation;
 		crtc->mode = saved_mode;
-	} else
+	}
+#if defined(XF86_CRTC_VERSION) && XF86_CRTC_VERSION >= 3
+	else
 		crtc->active = TRUE;
+#endif
 
 	return ret;
 }