xf86-video-ati: Branch 'master'

[Alex Deucher]

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

New commits:
commit bfa22d676a6f333503104041f62222f4de9bb7d8
Author: Alex Deucher <alex at t41p.hsd1.va.comcast.net>
Date:   Wed Dec 26 12:29:47 2007 -0500

    RADEON: fix typo that broke tv load detection

diff --git a/src/legacy_output.c b/src/legacy_output.c
index 694e7c7..4b7fded 100644
--- a/src/legacy_output.c
+++ b/src/legacy_output.c
@@ -562,15 +562,15 @@ legacy_dac_detect(ScrnInfoPtr pScrn, xf86OutputPtr output)
     if (OUTPUT_IS_TV) {
 	if (xf86ReturnOptValBool(info->Options, OPTION_FORCE_TVOUT, FALSE)) {
 	    if (radeon_output->type == OUTPUT_STV)
-		radeon_output->MonType = MT_STV;
+		found = MT_STV;
 	    else
-		radeon_output->MonType = MT_CTV;
+		found = MT_CTV;
 	} else {
 	    if (info->InternalTVOut) {
 		if (radeon_output->load_detection)
-		    radeon_output->MonType = radeon_detect_tv(pScrn);
+		    found = radeon_detect_tv(pScrn);
 		else
-		    radeon_output->MonType = MT_NONE;
+		    found = MT_NONE;
 	    }
 	}
     } else {