xf86-video-ati: Branch 'master'

[Dave Airlie]

 src/radeon_exa_render.c |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 8404c37b2ff95aba31db97676f106ec2f30fda7f
Author: Dave Airlie <airlied at linux.ie>
Date:   Sun Oct 4 18:18:51 2009 +1000

    radeon: fix build without kms

diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c
index 7bc8ef0..6753f00 100644
--- a/src/radeon_exa_render.c
+++ b/src/radeon_exa_render.c
@@ -2237,9 +2237,11 @@ static void FUNC_NAME(RadeonCompositeTile)(ScrnInfoPtr pScrn,
 	if (!info->accel_state->draw_header) {
 	    BEGIN_RING(2);
 
+#ifdef XF86DRM_MODE
 	    if (info->cs)
 		info->accel_state->draw_header = info->cs->packets + info->cs->cdw;
 	    else
+#endif
 		info->accel_state->draw_header = __head;
 	    info->accel_state->num_vtx = 0;
 	    info->accel_state->vtx_count = vtx_count;