diff options
| author | Eric Anholt <eric@anholt.net> | 2007-07-19 06:31:26 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2007-07-19 06:31:26 -0700 |
| commit | 05204b9c8d021e019456a8dbd83c012e277c7aaf (patch) | |
| tree | 5639c2821d47e92cc615059cbc12e9c050753230 /shared-core/i915_mem.c | |
| parent | e544286eae71a6b150af4d86096895c14e42c36e (diff) | |
| parent | 0c95d489abd19efd2ba017e78a4b28cea0854e77 (diff) | |
Merge branch 'origin'
Diffstat (limited to 'shared-core/i915_mem.c')
| -rw-r--r-- | shared-core/i915_mem.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/shared-core/i915_mem.c b/shared-core/i915_mem.c index 13f19f3a..582687ad 100644 --- a/shared-core/i915_mem.c +++ b/shared-core/i915_mem.c @@ -43,11 +43,11 @@ * block to allocate, and the ring is drained prior to allocations -- * in other words allocation is expensive. */ -static void mark_block(drm_device_t * dev, struct mem_block *p, int in_use) +static void mark_block(struct drm_device * dev, struct mem_block *p, int in_use) { drm_i915_private_t *dev_priv = dev->dev_private; drm_i915_sarea_t *sarea_priv = dev_priv->sarea_priv; - drm_tex_region_t *list; + struct drm_tex_region *list; unsigned shift, nr; unsigned start; unsigned end; @@ -208,7 +208,7 @@ static int init_heap(struct mem_block **heap, int start, int size) /* Free all blocks associated with the releasing file. */ -void i915_mem_release(drm_device_t * dev, DRMFILE filp, struct mem_block *heap) +void i915_mem_release(struct drm_device * dev, DRMFILE filp, struct mem_block *heap) { struct mem_block *p; |