xf86-video-ati: Branch 'master'

[Dave Airlie]

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

New commits:
commit f36db6e10d32a68b32d20ae4ad02cfc0bfd1c9c3
Author: Dave Airlie <airlied at linux.ie>
Date:   Thu Jan 3 11:27:47 2008 +1000

    r600: fixup crash on unknown output type
    
    not sure this is 100% the correct approach

diff --git a/src/radeon_atombios.c b/src/radeon_atombios.c
index 4b7421f..f4d7b2b 100644
--- a/src/radeon_atombios.c
+++ b/src/radeon_atombios.c
@@ -1533,7 +1533,7 @@ RADEONGetATOMConnectorInfoFromBIOSObject (ScrnInfoPtr pScrn)
 		break;
 	    case ENCODER_OBJECT_ID_INTERNAL_DAC2:
 	    case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC2:
-		info->BiosConnector[i].devices |= (1 << ATOM_DEVICE_CRT2_INDEX);
+		info->BiosConnector[i].devices |= (1 << ATOM_DEVICE_CRT2_INDEX) | (1<<ATOM_DEVICE_TV1_INDEX);
 		info->BiosConnector[i].DACType = DAC_TVDAC;
 		break;
 	    }