diff options
| author | Alex Deucher <alex@samba.(none)> | 2007-12-12 22:37:44 -0500 |
|---|---|---|
| committer | Alex Deucher <alex@samba.(none)> | 2007-12-12 22:37:44 -0500 |
| commit | f5ac34983411e4c4f41ab1817dce582830f398fd (patch) | |
| tree | 4d2c47513ae6893ff7ea928704718356eb3824cd /src/radeon.h | |
| parent | f2b2e0804183b52d9d3f56ad85b3552ece76c544 (diff) | |
| parent | 6ccf5b33d27218ae1c45ab93c122438ed536d8ba (diff) | |
Merge branch 'master' of git+ssh://agd5f@git.freedesktop.org/git/xorg/driver/xf86-video-ati into atombios-support
merge and fix conflicts
Diffstat (limited to 'src/radeon.h')
| -rw-r--r-- | src/radeon.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/radeon.h b/src/radeon.h index b1091bd..038fcc7 100644 --- a/src/radeon.h +++ b/src/radeon.h @@ -408,10 +408,6 @@ typedef struct { #endif Bool accelOn; xf86CursorInfoPtr cursor; - CARD32 cursor_offset; -#ifdef USE_XAA - unsigned long cursor_end; -#endif Bool allowColorTiling; Bool tilingEnabled; /* mirror of sarea->tiling_enabled */ #ifdef ARGB_CURSOR |