xf86-video-ati: Branch 'ati-6.7-branch'

[Dave Airlie]

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

New commits:
diff-tree 26aacfd90e2502c6e2a6c10761b4b2da7971b2bc (from 3334c247540b113f9c4a5ce1879d8648a45a959a)
Author: Henry Zhao <henry.zhao at sun.com>
Date:   Thu Aug 23 19:10:03 2007 +1000

    radeon: bug 11725: fix mergedfb transient vertical bar

diff --git a/src/radeon_mergedfb.c b/src/radeon_mergedfb.c
index abbc160..c786aac 100644
--- a/src/radeon_mergedfb.c
+++ b/src/radeon_mergedfb.c
@@ -2019,7 +2019,7 @@ RADEONSetCursorPositionMerged(ScrnInfoPt
     DisplayModePtr mode1 = CDMPTR->CRT1;
     DisplayModePtr mode2 = CDMPTR->CRT2;
     int            x1, y1, x2, y2;
-    int                total_y1    = pScrn->frameY1 - pScrn->frameY0;
+    int                total_y1    = info->CRT1frameY1 - info->CRT1frameY0;
     int                total_y2    = pScrn2->frameY1 - pScrn2->frameY0;
 
     if (x < 0)                        xorigin = -x+1;