xf86-video-ati: Branch 'master'

[Alex Deucher]

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

New commits:
commit 10fbbac4bed59e12ad794ac873dd415d9ee4e340
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Tue Mar 31 15:14:27 2009 -0400

    Mac mini: fix connector setup for real
    
    fixes f061308e7abcf93d1612681b935387fee23e0a24
    fixes bugs 20796 and 20979

diff --git a/src/radeon_output.c b/src/radeon_output.c
index b5fe0ac..8dd0842 100644
--- a/src/radeon_output.c
+++ b/src/radeon_output.c
@@ -2085,7 +2085,7 @@ static Bool RADEONSetupAppleConnectors(ScrnInfoPtr pScrn)
 	info->BiosConnector[0].devices = ATOM_DEVICE_CRT2_SUPPORT | ATOM_DEVICE_DFP2_SUPPORT;
 	if (!radeon_add_encoder(pScrn,
 				radeon_get_encoder_id_from_supported_device(pScrn,
-									    ATOM_DEVICE_CRT1_SUPPORT,
+									    ATOM_DEVICE_CRT2_SUPPORT,
 									    1),
 				ATOM_DEVICE_CRT2_SUPPORT))
 	    return FALSE;
@@ -2116,7 +2116,7 @@ static Bool RADEONSetupAppleConnectors(ScrnInfoPtr pScrn)
 	info->BiosConnector[0].devices = ATOM_DEVICE_CRT2_SUPPORT | ATOM_DEVICE_DFP1_SUPPORT;
 	if (!radeon_add_encoder(pScrn,
 				radeon_get_encoder_id_from_supported_device(pScrn,
-									    ATOM_DEVICE_CRT1_SUPPORT,
+									    ATOM_DEVICE_CRT2_SUPPORT,
 									    1),
 				ATOM_DEVICE_CRT2_SUPPORT))
 	    return FALSE;