xf86-video-mach64: Branch 'master'

[Dave Airlie]

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

New commits:
commit 5eb7fec958bc6ba8a1a2b0be4916cac818866e1c
Author: Dave Airlie <airlied at gmail.com>
Date:   Wed Jul 18 18:46:49 2012 +1000

    mach64: fix build on 32-bit.
    
    tvout code only builds on 32-bit, fix build.
    
    Signed-off-by: Dave Airlie <airlied at redhat.com>

diff --git a/src/atiscreen.c b/src/atiscreen.c
index 2957877..b1fbd3c 100644
--- a/src/atiscreen.c
+++ b/src/atiscreen.c
@@ -580,7 +580,7 @@ ATIScreenInit(SCREEN_INIT_ARGS_DECL)
 #ifdef TV_OUT
     /* Fix-up TV out after ImpacTV probe */
     if (pATI->OptionTvOut && pATI->Chip < ATI_CHIP_264GTPRO)
-        ATISwitchMode(0, pScreenInfo->currentMode, 0);
+        ATISwitchMode(SWITCH_MODE_ARGS(pScreenInfo, pScreenInfo->currentMode));
 #endif /* TV_OUT */
 
 #ifdef XF86DRI_DEVEL