xf86-video-ati: Branch 'master'

[Dave Airlie]

 src/radeon_atombios.c |   19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

New commits:
commit 308848783ed9ae27aed7c7de6ee813d375ef495e
Author: Dave Airlie <airlied at linux.ie>
Date:   Sat Jan 5 09:11:55 2008 +1000

    i2c: a line mux of 0 is valid

diff --git a/src/radeon_atombios.c b/src/radeon_atombios.c
index 73a185b..8b31a33 100644
--- a/src/radeon_atombios.c
+++ b/src/radeon_atombios.c
@@ -1717,17 +1717,14 @@ RADEONGetATOMConnectorInfoFromBIOSConnectorTable (ScrnInfoPtr pScrn)
 	info->BiosConnector[i].ConnectorType = ci.sucConnectorInfo.sbfAccess.bfConnectorType;
 	info->BiosConnector[i].DACType = ci.sucConnectorInfo.sbfAccess.bfAssociatedDAC - 1;
 
-	if (ci.sucI2cId.sbfAccess.bfI2C_LineMux) {
-	    /* don't assign a gpio for tv */
-	    if ((i == ATOM_DEVICE_TV1_INDEX) ||
-		(i == ATOM_DEVICE_TV2_INDEX) ||
-		(i == ATOM_DEVICE_CV_INDEX))
-		info->BiosConnector[i].ddc_line = 0;
-	    else
-		info->BiosConnector[i].ddc_line =
-		    RADEONLookupGPIOLineForDDC(pScrn, ci.sucI2cId.sbfAccess.bfI2C_LineMux);
-	} else {
-	    info->BiosConnector[i].ddc_line = 0;
+	/* don't assign a gpio for tv */
+	if ((i == ATOM_DEVICE_TV1_INDEX) ||
+	    (i == ATOM_DEVICE_TV2_INDEX) ||
+            (i == ATOM_DEVICE_CV_INDEX))
+            info->BiosConnector[i].ddc_line = 0;
+	else
+	    info->BiosConnector[i].ddc_line =
+	        RADEONLookupGPIOLineForDDC(pScrn, ci.sucI2cId.sbfAccess.bfI2C_LineMux);
 	}
 
 	if (i == ATOM_DEVICE_DFP1_INDEX)