diff options
| author | Jody McIntyre <scjody@modernduck.com> | 2006-01-04 11:43:17 -0500 |
|---|---|---|
| committer | Jody McIntyre <scjody@modernduck.com> | 2006-01-04 11:43:17 -0500 |
| commit | 34b8c399dc04c8e51f014b73458e654570698597 (patch) | |
| tree | 7027eda7a780e9d945ef271f8c2ea5aaede5dd25 /drivers/char/drm | |
| parent | eaceec7f6cc5223d0f146086884d67746b8aa81d (diff) | |
| parent | 88026842b0a760145aa71d69e74fbc9ec118ca44 (diff) | |
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/char/drm')
| -rw-r--r-- | drivers/char/drm/radeon_cp.c | 2 | ||||
| -rw-r--r-- | drivers/char/drm/radeon_drv.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/char/drm/radeon_cp.c b/drivers/char/drm/radeon_cp.c index 03839ea3109..342302d4674 100644 --- a/drivers/char/drm/radeon_cp.c +++ b/drivers/char/drm/radeon_cp.c @@ -1311,7 +1311,7 @@ static void radeon_set_pcigart(drm_radeon_private_t * dev_priv, int on) static int radeon_do_init_cp(drm_device_t * dev, drm_radeon_init_t * init) { - drm_radeon_private_t *dev_priv = dev->dev_private;; + drm_radeon_private_t *dev_priv = dev->dev_private; DRM_DEBUG("\n"); dev_priv->is_pci = init->is_pci; diff --git a/drivers/char/drm/radeon_drv.h b/drivers/char/drm/radeon_drv.h index 7bda7e33d2b..d92ccee3e54 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) |