xf86-video-ati: Branch 'master'

[Dave Airlie]

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

New commits:
commit 94bf8f01bd43cb103fffecfe04d04a214f892baf
Author: Dave Airlie <airlied at redhat.com>
Date:   Mon May 12 20:02:51 2008 +1000

    radeon: fix set_cursor_colours remove fb offset

diff --git a/src/radeon_cursor.c b/src/radeon_cursor.c
index 42f9a85..d68d64b 100644
--- a/src/radeon_cursor.c
+++ b/src/radeon_cursor.c
@@ -256,7 +256,7 @@ radeon_crtc_set_cursor_colors (xf86CrtcPtr crtc, int bg, int fg)
     ScrnInfoPtr pScrn = crtc->scrn;
     RADEONCrtcPrivatePtr radeon_crtc = crtc->driver_private;
     RADEONInfoPtr      info       = RADEONPTR(pScrn);
-    CARD32        *pixels     = (CARD32 *)(pointer)(info->FB + radeon_crtc->cursor_offset + pScrn->fbOffset);
+    CARD32        *pixels     = (CARD32 *)(pointer)(info->FB + radeon_crtc->cursor_offset);
     int            pixel, i;
     CURSOR_SWAPPING_DECL_MMIO