xf86-video-ati: Branch 'master'

[Dave Airlie]

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

New commits:
commit ca81fa086b21633a7fd926833fb6d1d4fa080646
Author: Dave Airlie <airlied at linux.ie>
Date:   Wed May 7 01:12:01 2008 +1000

    radeon: zaphod fix for cursor on second head
    
    We don't need to add fbOffset here as the mmap we have of the framebuffer
    starts half way.

diff --git a/src/radeon_cursor.c b/src/radeon_cursor.c
index b82484e..983aefb 100644
--- a/src/radeon_cursor.c
+++ b/src/radeon_cursor.c
@@ -298,7 +298,7 @@ radeon_crtc_load_cursor_argb (xf86CrtcPtr crtc, CARD32 *image)
     RADEONCrtcPrivatePtr radeon_crtc = crtc->driver_private;
     RADEONInfoPtr  info       = RADEONPTR(pScrn);
     CURSOR_SWAPPING_DECL_MMIO
-    CARD32        *d          = (CARD32 *)(pointer)(info->FB + radeon_crtc->cursor_offset + pScrn->fbOffset);
+    CARD32        *d          = (CARD32 *)(pointer)(info->FB + radeon_crtc->cursor_offset);
 
     RADEONCTRACE(("RADEONLoadCursorARGB\n"));