xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/radeon_driver.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 0a8d04eeac95f4db9d03ee31070bd825a7feb0b2
Author: Matthieu Herrb <matthieu.herrb at laas.fr>
Date:   Sun Jan 1 18:27:54 2012 +0100

    Update for new vgaHW API.
    
    Signed-off-by: Matthieu Herrb <matthieu.herrb at laas.fr>
    Reviewed-by: Mark Kettenis <kettenis at openbsd.org>
    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index a9abd66..81f5645 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -3131,8 +3131,10 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
     } else
            xf86DrvMsg(pScrn->scrnIndex, X_INFO, "VGAAccess option set to FALSE,"
                       " VGA module load skipped\n");
-    if (info->VGAAccess)
+    if (info->VGAAccess) {
+	vgaHWSetStdFuncs(VGAHWPTR(pScrn));
         vgaHWGetIOBase(VGAHWPTR(pScrn));
+    }
 #endif