xf86-video-ati: Branch 'master'

[Dave Airlie]

 src/radeon_display.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

New commits:
diff-tree 13e0a95564220d42ad8060b43b0aaaba3002157a (from 63444770ff30afeb134befed5bb3a5c28b7bc4e9)
Author: David Airlie <airlied at asimov.stargames.com.au>
Date:   Mon Nov 13 09:35:18 2006 +1100

    fix up issue with bindings and mergedfb

diff --git a/src/radeon_display.c b/src/radeon_display.c
index d4264f6..6aa87d4 100644
--- a/src/radeon_display.c
+++ b/src/radeon_display.c
@@ -1351,14 +1351,15 @@ Bool RADEONMapControllers(ScrnInfoPtr pS
 	    info->DisplayType = pRADEONEnt->Controller[1].pPort->MonType;
 	    pScrn->monitor->DDC = pRADEONEnt->Controller[1].pPort->MonInfo;
 	} else {
-  	    pRADEONEnt->Controller[1].binding = 1;
+  	    pRADEONEnt->Controller[0].binding = 1;
 	    info->DisplayType = pRADEONEnt->Controller[0].pPort->MonType; 
 	    pScrn->monitor->DDC = pRADEONEnt->Controller[0].pPort->MonInfo;
 	}
 	
 	if(!pRADEONEnt->HasSecondary) {
-  	    pRADEONEnt->Controller[1].binding = 1;
 	    info->MergeType = pRADEONEnt->Controller[1].pPort->MonType;
+	    if (info->MergeType)
+  	    	pRADEONEnt->Controller[1].binding = 1;
 	} 
     } else {
 	if (pRADEONEnt->Controller[0].pPort->MonType == MT_NONE)