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_probe.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_probe.h')
| -rw-r--r-- | src/radeon_probe.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/radeon_probe.h b/src/radeon_probe.h index df071499..a25d6350 100644 --- a/src/radeon_probe.h +++ b/src/radeon_probe.h @@ -165,6 +165,7 @@ typedef struct _RADEONCrtcPrivateRec { #endif int crtc_id; int binding; + CARD32 cursor_offset; /* Lookup table values to be set when the CRTC is enabled */ CARD8 lut_r[256], lut_g[256], lut_b[256]; @@ -175,7 +176,6 @@ typedef struct _RADEONCrtcPrivateRec { int fb_pitch, fb_width, fb_height; INT16 cursor_x; INT16 cursor_y; - unsigned long cursor_offset; } RADEONCrtcPrivateRec, *RADEONCrtcPrivatePtr; typedef struct { |