xf86-video-ati: Branch 'master'

[Alex Deucher]

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

New commits:
commit 4146bfe5d00e40a86d17826fac50d04b2469621d
Author: Alex Deucher <alex at samba.(none)>
Date:   Sat Feb 23 19:21:52 2008 -0500

    R500: fix typo in new r5xx regs

diff --git a/src/radeon_reg.h b/src/radeon_reg.h
index 3702ee4..9460967 100644
--- a/src/radeon_reg.h
+++ b/src/radeon_reg.h
@@ -4242,8 +4242,8 @@
 #   define R500_ALU_RGB_OMOD_MUL_4			(2 << 26)
 #   define R500_ALU_RGB_OMOD_MUL_8			(3 << 26)
 #   define R500_ALU_RGB_OMOD_DIV_2			(4 << 26)
-#   define R500_ALU_RGB_OMOD_DIV_2			(5 << 26)
-#   define R500_ALU_RGB_OMOD_DIV_2			(6 << 26)
+#   define R500_ALU_RGB_OMOD_DIV_4			(5 << 26)
+#   define R500_ALU_RGB_OMOD_DIV_8			(6 << 26)
 #   define R500_ALU_RGB_OMOD_DISABLE			(7 << 26)
 #   define R500_ALU_RGB_TARGET(x)			(x << 29)
 #   define R500_ALU_RGB_WMASK				(1 << 31)