xf86-video-ati: Branch 'master'

[Dave Airlie]

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

New commits:
commit 9a5b501332c0a1f10af20845af48c9ddd2ce26a0
Author: Dave Airlie <airlied at linux.ie>
Date:   Fri Dec 21 09:45:55 2007 +1000

    set ddc line correctly post-merge

diff --git a/src/radeon_bios.c b/src/radeon_bios.c
index b4a69a3..752b31e 100644
--- a/src/radeon_bios.c
+++ b/src/radeon_bios.c
@@ -421,7 +421,7 @@ static Bool RADEONGetLegacyConnectorInfoFromBIOS (ScrnInfoPtr pScrn)
 	    info->BiosConnector[0].ConnectorType = CONNECTOR_DVI_I;
 	    info->BiosConnector[0].DACType = DAC_PRIMARY;
 	    info->BiosConnector[0].TMDSType = TMDS_INT;
-	    info->BiosConnector[0].DDCType = DDC_DVI;
+	    info->BiosConnector[0].ddc_line = RADEON_GPIO_DVI_DDC;
 	} else
 	    return FALSE;
     }