xf86-video-ati: Branch 'master'

[Alex Deucher]

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

New commits:
commit 75bf5272936093bc024559e5744d97d8e79943b1
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Tue Mar 31 15:17:37 2009 -0400

    mac mini: 3rd time's the charm
    
    fixes 10fbbac4bed59e12ad794ac873dd415d9ee4e340
    fixes bugs 20796 and 20979

diff --git a/src/radeon_output.c b/src/radeon_output.c
index 8dd0842..719f9e8 100644
--- a/src/radeon_output.c
+++ b/src/radeon_output.c
@@ -2086,7 +2086,7 @@ static Bool RADEONSetupAppleConnectors(ScrnInfoPtr pScrn)
 	if (!radeon_add_encoder(pScrn,
 				radeon_get_encoder_id_from_supported_device(pScrn,
 									    ATOM_DEVICE_CRT2_SUPPORT,
-									    1),
+									    2),
 				ATOM_DEVICE_CRT2_SUPPORT))
 	    return FALSE;
 	if (!radeon_add_encoder(pScrn,
@@ -2117,7 +2117,7 @@ static Bool RADEONSetupAppleConnectors(ScrnInfoPtr pScrn)
 	if (!radeon_add_encoder(pScrn,
 				radeon_get_encoder_id_from_supported_device(pScrn,
 									    ATOM_DEVICE_CRT2_SUPPORT,
-									    1),
+									    2),
 				ATOM_DEVICE_CRT2_SUPPORT))
 	    return FALSE;
 	if (!radeon_add_encoder(pScrn,