diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2006-01-03 10:59:55 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2006-01-03 10:59:55 -0500 |
commit | 02f693c7118f6be9e677070eb630c1f3a654cdd3 (patch) | |
tree | b5493c816a1f76a01319a84955c5ba07d47517c3 /drivers/char/drm/radeon_drv.h | |
parent | e7fb585940a3dc87a42ebc30a62296e5cf6f9cd5 (diff) | |
parent | a18ceba7b40e24a9da87249bd74f16ea5abd6894 (diff) | |
download | kernel_samsung_aries-02f693c7118f6be9e677070eb630c1f3a654cdd3.zip kernel_samsung_aries-02f693c7118f6be9e677070eb630c1f3a654cdd3.tar.gz kernel_samsung_aries-02f693c7118f6be9e677070eb630c1f3a654cdd3.tar.bz2 |
Merge branch 'upstream'
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) |