xf86-video-ati: Branch 'master'

[Alex Deucher]

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

New commits:
commit 2b98ec1f7e931019a4ab699a56d5dfaa395946fb
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Wed Sep 1 13:24:19 2010 -0400

    r6xx/r7xx: fix typos
    
    some stray - signs

diff --git a/src/r6xx_accel.c b/src/r6xx_accel.c
index 86817bd..ff7dfda 100644
--- a/src/r6xx_accel.c
+++ b/src/r6xx_accel.c
@@ -899,7 +899,7 @@ set_default_state(ScrnInfoPtr pScrn, drmBufPtr ib)
     BEGIN_BATCH(80);
     if (info->ChipFamily < CHIP_FAMILY_RV770) {
 	EREG(ib, TA_CNTL_AUX, (( 3 << GRADIENT_CREDIT_shift) |
-				 - (28 << TD_FIFO_CREDIT_shift)));
+			       (28 << TD_FIFO_CREDIT_shift)));
 	EREG(ib, VC_ENHANCE, 0);
 	EREG(ib, R7xx_SQ_DYN_GPR_CNTL_PS_FLUSH_REQ, 0);
 	EREG(ib, DB_DEBUG, 0x82000000); /* ? */
@@ -911,7 +911,7 @@ set_default_state(ScrnInfoPtr pScrn, drmBufPtr ib)
 				 0));
     } else {
 	EREG(ib, TA_CNTL_AUX, (( 2 << GRADIENT_CREDIT_shift) |
-			       - (28 << TD_FIFO_CREDIT_shift)));
+			       (28 << TD_FIFO_CREDIT_shift)));
 	EREG(ib, VC_ENHANCE, 0);
 	EREG(ib, R7xx_SQ_DYN_GPR_CNTL_PS_FLUSH_REQ, VS_PC_LIMIT_ENABLE_bit);
 	EREG(ib, DB_DEBUG, 0);