xf86-video-ati: Branch 'master'

[Adam Jackson]

 src/radeon_reg.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ed0a93edf28155308e7ab9d8705581bb38455ea0
Author: Adam Jackson <ajax at redhat.com>
Date:   Sat Feb 23 15:02:17 2008 -0500

    Fix R500_US_CONFIG.

diff --git a/src/radeon_reg.h b/src/radeon_reg.h
index df02f77..88cf147 100644
--- a/src/radeon_reg.h
+++ b/src/radeon_reg.h
@@ -4309,7 +4309,7 @@
 #   define R500_US_CODE_RANGE_ADDR(x)			(x << 0)
 #   define R500_US_CODE_RANGE_SIZE(x)			(x << 16)
 #define R500_US_CONFIG					0x4600
-#   define R500_ZERO_TIMES_ANYTHING_EQUALS_ZERO		(1 << 0)
+#   define R500_ZERO_TIMES_ANYTHING_EQUALS_ZERO		(1 << 1)
 #define R500_US_FC_ADDR_0				0xa000
 #   define R500_FC_BOOL_ADDR(x)				(x << 0)
 #   define R500_FC_INT_ADDR(x)				(x << 8)