diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-19 00:09:53 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-19 00:09:53 -0500 |
commit | 418fbfe979d96efc7b91f29b2085d51541c61f0b (patch) | |
tree | a9acb07328e0c76011727d5b3b6f5407afcd2866 /drivers/char/drm/radeon_drv.h | |
parent | 8b132f4ee7304fec4fa27dec67879bc0172e916a (diff) | |
parent | ff60dde9e46b87757d5e83bd58be0688fca8e816 (diff) | |
download | kernel_samsung_tuna-418fbfe979d96efc7b91f29b2085d51541c61f0b.zip kernel_samsung_tuna-418fbfe979d96efc7b91f29b2085d51541c61f0b.tar.gz kernel_samsung_tuna-418fbfe979d96efc7b91f29b2085d51541c61f0b.tar.bz2 |
Merge branch 'master'
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 7bda7e3..d92ccee 100644 --- a/drivers/char/drm/radeon_drv.h +++ b/drivers/char/drm/radeon_drv.h @@ -379,6 +379,7 @@ extern int r300_do_cp_cmdbuf(drm_device_t * dev, DRMFILE filp, # define RADEON_PLL_WR_EN (1 << 7) #define RADEON_CLOCK_CNTL_INDEX 0x0008 #define RADEON_CONFIG_APER_SIZE 0x0108 +#define RADEON_CONFIG_MEMSIZE 0x00f8 #define RADEON_CRTC_OFFSET 0x0224 #define RADEON_CRTC_OFFSET_CNTL 0x0228 # define RADEON_CRTC_TILE_EN (1 << 15) |