xf86-video-ati: Branch 'master'

[Dave Airlie]

 src/radeon_atombios.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 1a7d9bc53512b0a5240176c949e6abf1ae2fb1fd
Author: Dave Airlie <airlied at redhat.com>
Date:   Fri Jun 20 14:14:21 2008 +1000

    atombios: use MMIO from the entity not the info

diff --git a/src/radeon_atombios.c b/src/radeon_atombios.c
index 314bc15..900e928 100644
--- a/src/radeon_atombios.c
+++ b/src/radeon_atombios.c
@@ -2047,8 +2047,8 @@ UINT32
 CailReadATIRegister(VOID* CAIL, UINT32 idx)
 {
     ScrnInfoPtr pScrn = xf86Screens[((atomBiosHandlePtr)CAIL)->scrnIndex];
-    RADEONInfoPtr  info   = RADEONPTR(pScrn);
-    unsigned char *RADEONMMIO = info->MMIO;
+    RADEONEntPtr pRADEONEnt = RADEONEntPriv(pScrn);
+    unsigned char *RADEONMMIO = pRADEONEnt->MMIO;
     UINT32 ret;
     CAILFUNC(CAIL);
 
@@ -2061,8 +2061,8 @@ VOID
 CailWriteATIRegister(VOID *CAIL, UINT32 idx, UINT32 data)
 {
     ScrnInfoPtr pScrn = xf86Screens[((atomBiosHandlePtr)CAIL)->scrnIndex];
-    RADEONInfoPtr  info   = RADEONPTR(pScrn);
-    unsigned char *RADEONMMIO = info->MMIO;
+    RADEONEntPtr pRADEONEnt = RADEONEntPriv(pScrn);
+    unsigned char *RADEONMMIO = pRADEONEnt->MMIO;
     CAILFUNC(CAIL);
 
     OUTREG(idx << 2,data);