xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/radeon_dri2.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 122b471f734aa07427b01d4bec35ff1ac28290b5
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Fri Jun 17 04:02:16 2011 -0400

    dri2: fix copy pasto in a6154c00c64932332e8f6e334661ffd579cfd894
    
    Reported-by: Nils Wallménius <nils.wallmenius at gmail.com>
    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>

diff --git a/src/radeon_dri2.c b/src/radeon_dri2.c
index 512c447..1133319 100644
--- a/src/radeon_dri2.c
+++ b/src/radeon_dri2.c
@@ -151,7 +151,7 @@ radeon_dri2_create_buffers(DrawablePtr drawable,
 
 	    if (flags & RADEON_CREATE_PIXMAP_TILING_MICRO)
 		tiling |= RADEON_TILING_MICRO;
-	    if (flags & RADEON_CREATE_PIXMAP_TILING_MICRO)
+	    if (flags & RADEON_CREATE_PIXMAP_TILING_MACRO)
 		tiling |= RADEON_TILING_MACRO;
 
 	    if (need_enlarge) {
@@ -303,7 +303,7 @@ radeon_dri2_create_buffer(DrawablePtr drawable,
 
 	if (flags & RADEON_CREATE_PIXMAP_TILING_MICRO)
 	    tiling |= RADEON_TILING_MICRO;
-	if (flags & RADEON_CREATE_PIXMAP_TILING_MICRO)
+	if (flags & RADEON_CREATE_PIXMAP_TILING_MACRO)
 	    tiling |= RADEON_TILING_MACRO;
 
 	if (need_enlarge) {