xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/r600_shader.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 139b38bf67ec10d876cc56df833541d497ae4fa4
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Thu Jun 24 14:55:09 2010 -0400

    r6xx shader: use ADDR() for CF_DWORD0
    
    no change in functionality

diff --git a/src/r600_shader.c b/src/r600_shader.c
index e78aa32..7e25f6d 100644
--- a/src/r600_shader.c
+++ b/src/r600_shader.c
@@ -1403,7 +1403,7 @@ int R600_comp_vs(RADEONChipFamily ChipSet, uint32_t* shader)
                             WHOLE_QUAD_MODE(0),
                             BARRIER(0));
     /* 2 */
-    shader[i++] = CF_DWORD0(0);
+    shader[i++] = CF_DWORD0(ADDR(0));
     shader[i++] = CF_DWORD1(POP_COUNT(0),
                             CF_CONST(0),
                             COND(SQ_CF_COND_ACTIVE),