xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/radeon_driver.c |    2 +-
 src/radeon_probe.h  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d8d6c9fe4ae7e1ab67dd041a251e901d97c29ed6
Author: Alex Deucher <alex at botch2.(none)>
Date:   Thu Feb 28 17:01:14 2008 -0500

    RS6xx: fix typos in previous commit
    
    Noted by Maciej Cencora on IRC

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index e9c24af..10b0b8c 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -4354,7 +4354,7 @@ avivo_restore(ScrnInfoPtr pScrn, RADEONSavePtr restore)
 
     if (info->IsIGP) {
 	int i, j = 0;
-	for (i = 0x7200; i <= 0x7290; i =+ 4) {
+	for (i = 0x7200; i <= 0x7290; i += 4) {
 	    OUTREG(i, state->ddia[j]);
 	    j++;
 	}
diff --git a/src/radeon_probe.h b/src/radeon_probe.h
index d11f3d9..82bb153 100644
--- a/src/radeon_probe.h
+++ b/src/radeon_probe.h
@@ -362,7 +362,7 @@ struct avivo_state
     struct avivo_dig_state tmds2;
 
     /* DDIA block on RS6xx chips */
-    CARD32 ddia[36];
+    CARD32 ddia[37];
 };
 
 /*