xf86-video-ati: Branch 'master'

[Dave Airlie]

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

New commits:
commit 595f7c3a60ca982ca2836a0174e1f36f9d1a4fec
Author: Dave Airlie <airlied at itt42.(none)>
Date:   Mon Aug 17 09:38:09 2009 +1000

    radeon/tv: fix typo in crtc register modifications

diff --git a/src/radeon_tv.c b/src/radeon_tv.c
index eef45d9..6c083ce 100644
--- a/src/radeon_tv.c
+++ b/src/radeon_tv.c
@@ -1198,7 +1198,7 @@ void RADEONAdjustCrtc2RegistersForTV(ScrnInfoPtr pScrn, RADEONSavePtr save,
     save->crtc2_v_total_disp = ((constPtr->verResolution - 1) << RADEON_CRTC_V_DISP_SHIFT) |
 	((constPtr->verTotal - 1) << RADEON_CRTC_V_TOTAL_SHIFT);
 
-    save->crtc_v_sync_strt_wid = (save->crtc_v_sync_strt_wid & ~RADEON_CRTC_V_SYNC_STRT) |
+    save->crtc2_v_sync_strt_wid = (save->crtc2_v_sync_strt_wid & ~RADEON_CRTC_V_SYNC_STRT) |
 	((constPtr->verSyncStart - 1) << RADEON_CRTC_V_SYNC_STRT_SHIFT);
 
 }