xf86-video-ati: Branch 'atombios-support'

[Dave Airlie]

 src/radeon_driver.c |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

New commits:
commit 48e31cdaa0caa21573879af5b9267773fe89176a
Author: George Wu <geo at ocf.berkeley.edu>
Date:   Sun Dec 2 15:25:09 2007 +1000

    RADEON/R600: small code cleanup

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 6e98913..ba4c111 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -1349,15 +1349,13 @@ static void RADEONInitMemoryMap(ScrnInfoPtr pScrn)
     /* We shouldn't use info->videoRam here which might have been clipped
      * but the real video RAM instead
      */
-    if (info->ChipFamily >= CHIP_FAMILY_R600)
+    if (info->ChipFamily >= CHIP_FAMILY_R600) {
 	mem_size = INREG(R600_CONFIG_MEMSIZE);
-    else
-	mem_size = INREG(RADEON_CONFIG_MEMSIZE);
-    
-    if (info->ChipFamily >= CHIP_FAMILY_R600)
 	aper_size = INREG(R600_CONFIG_APER_SIZE);
-    else
+    } else {
+	mem_size = INREG(RADEON_CONFIG_MEMSIZE);
 	aper_size = INREG(RADEON_CONFIG_APER_SIZE);
+    }
 
     if (mem_size == 0)
 	    mem_size = 0x800000;