xf86-video-ati: Branch 'master'

[Dave Airlie]

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

New commits:
commit 0c2118586d3edeecc2473b5d685472df4b5e70fa
Author: Dave Airlie <airlied at redhat.com>
Date:   Fri Jun 11 15:53:18 2010 +1000

    radeon: fixup last fix, use CURSOR_WIDTH not RADEON_CURSOR_WIDTH.

diff --git a/src/radeon_kms.c b/src/radeon_kms.c
index b2c4064..3f77207 100644
--- a/src/radeon_kms.c
+++ b/src/radeon_kms.c
@@ -1008,7 +1008,7 @@ static Bool radeon_setup_kernel_mem(ScreenPtr pScreen)
 
 #if X_BYTE_ORDER == X_BIG_ENDIAN
 		radeon_bo_set_tiling(info->cursor_bo[c], RADEON_TILING_SWAP_32BIT |
-				     RADEON_TILING_SURFACE, RADEON_CURSOR_WIDTH);
+				     RADEON_TILING_SURFACE, CURSOR_WIDTH);
 #endif
 
                 if (radeon_bo_map(info->cursor_bo[c], 1)) {