xf86-video-ati: Branch 'master'

[Alex Deucher]

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

New commits:
commit 22d7746bfc1bcbb3269afac88971254088ea9ece
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Thu Feb 26 11:00:46 2009 -0500

    RS600: enable the DRI by default

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 031d987..8bf2a02 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -2153,11 +2153,10 @@ static Bool RADEONPreInitDRI(ScrnInfoPtr pScrn)
 
     if (info->Chipset == PCI_CHIP_RN50_515E ||
 	info->Chipset == PCI_CHIP_RN50_5969 ||
-	info->ChipFamily == CHIP_FAMILY_RS600 ||
 	info->ChipFamily >= CHIP_FAMILY_R600) {
 	if (xf86ReturnOptValBool(info->Options, OPTION_DRI, FALSE)) {
 	    xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
-		"Direct rendering for RN50/RS600/R600 forced on -- "
+		"Direct rendering for RN50/R600 forced on -- "
 		"This is NOT officially supported at the hardware level "
 		"and may cause instability or lockups\n");
 	} else {