diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-04 18:00:35 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-04 18:00:35 -0800 |
| commit | b55d1b1814c52463c11707f53dbdc223e09b2924 (patch) | |
| tree | 4b9ca29e6601b80fdd6aaff7e62bf55b30b2fe07 /drivers/char/drm/radeon_drv.h | |
| parent | aa641935343e05795f7f7289e7b242138b612ffe (diff) | |
| parent | 038477aa15df6557ef0c8b2b60523c81eae58ee9 (diff) | |
| download | talos-op-linux-b55d1b1814c52463c11707f53dbdc223e09b2924.tar.gz talos-op-linux-b55d1b1814c52463c11707f53dbdc223e09b2924.zip | |
Merge branch 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm/sis: missing mutex unlock in error path.
radeon: set the address to access the GART table on the CPU side correctly
Diffstat (limited to 'drivers/char/drm/radeon_drv.h')
| -rw-r--r-- | drivers/char/drm/radeon_drv.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/char/drm/radeon_drv.h b/drivers/char/drm/radeon_drv.h index e4077bc212b3..bfbb60a9298c 100644 --- a/drivers/char/drm/radeon_drv.h +++ b/drivers/char/drm/radeon_drv.h @@ -293,6 +293,7 @@ typedef struct drm_radeon_private { /* starting from here on, data is preserved accross an open */ uint32_t flags; /* see radeon_chip_flags */ + unsigned long fb_aper_offset; } drm_radeon_private_t; typedef struct drm_radeon_buf_priv { |
