diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-18 10:48:49 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-18 10:48:49 -0500 |
| commit | 73f56c0d35e6427081a4eabd620d8b8d8a35bd09 (patch) | |
| tree | 9fe1a2577baea03f3a6ec4a5e79f3ff26c4ee0ae /drivers/gpu/drm/radeon/radeon_drv.h | |
| parent | 0af40a4b1050c050e62eb1dc30b82d5ab22bf221 (diff) | |
| parent | 8501c45cc32c311ae755a2d5ac8c4a5f04908d42 (diff) | |
Merge branch 'iommu-fixes-2.6.28' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into x86/urgent
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_drv.h')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_drv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h index 02f5575ba395..7a183789be97 100644 --- a/drivers/gpu/drm/radeon/radeon_drv.h +++ b/drivers/gpu/drm/radeon/radeon_drv.h | |||
| @@ -287,7 +287,6 @@ typedef struct drm_radeon_private { | |||
| 287 | unsigned long gart_textures_offset; | 287 | unsigned long gart_textures_offset; |
| 288 | 288 | ||
| 289 | drm_local_map_t *sarea; | 289 | drm_local_map_t *sarea; |
| 290 | drm_local_map_t *mmio; | ||
| 291 | drm_local_map_t *cp_ring; | 290 | drm_local_map_t *cp_ring; |
| 292 | drm_local_map_t *ring_rptr; | 291 | drm_local_map_t *ring_rptr; |
| 293 | drm_local_map_t *gart_textures; | 292 | drm_local_map_t *gart_textures; |
| @@ -318,6 +317,7 @@ typedef struct drm_radeon_private { | |||
| 318 | 317 | ||
| 319 | int num_gb_pipes; | 318 | int num_gb_pipes; |
| 320 | int track_flush; | 319 | int track_flush; |
| 320 | drm_local_map_t *mmio; | ||
| 321 | } drm_radeon_private_t; | 321 | } drm_radeon_private_t; |
| 322 | 322 | ||
| 323 | typedef struct drm_radeon_buf_priv { | 323 | typedef struct drm_radeon_buf_priv { |