xf86-video-ati: Branch 'master'

[Dave Airlie]

 src/radeon_driver.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a54ca3c699c103e2e3df87101dca929a3eee4377
Author: Dave Airlie <airlied at linux.ie>
Date:   Thu Jun 5 18:31:53 2008 +1000

    radeon: fix typo in memory calcs
    
    noticed by ghepeu on irc.

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 64010fa..2516590 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -1398,7 +1398,7 @@ static void RADEONGetVRamType(ScrnInfoPtr pScrn)
 	case 1: info->RamWidth = 128; break;
 	default: info->RamWidth = 128; break;
 	}
-    } else if ((info->ChipFamily >= CHIP_FAMILY_R520) ||
+    } else if ((info->ChipFamily >= CHIP_FAMILY_R520) &&
 	       (info->ChipFamily <= CHIP_FAMILY_RV570)){
 	/* r520/rv530/rv560/rv570/r580 */
 	tmp = INMC(pScrn, R520_MC_CNTL0);