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 /linux-core/via_mm.c | |
| parent | e544286eae71a6b150af4d86096895c14e42c36e (diff) | |
| parent | 0c95d489abd19efd2ba017e78a4b28cea0854e77 (diff) | |
Merge branch 'origin'
Diffstat (limited to 'linux-core/via_mm.c')
| -rw-r--r-- | linux-core/via_mm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linux-core/via_mm.c b/linux-core/via_mm.c index d97269f5..1ac51050 100644 --- a/linux-core/via_mm.c +++ b/linux-core/via_mm.c @@ -129,7 +129,7 @@ int via_mem_alloc(DRM_IOCTL_ARGS) drm_via_mem_t mem; int retval = 0; - drm_memblock_item_t *item; + struct drm_memblock_item *item; drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private; unsigned long tmpSize; @@ -190,10 +190,10 @@ int via_mem_free(DRM_IOCTL_ARGS) } -void via_reclaim_buffers_locked(drm_device_t * dev, struct file *filp) +void via_reclaim_buffers_locked(struct drm_device * dev, struct file *filp) { drm_via_private_t *dev_priv = dev->dev_private; - drm_file_t *priv = filp->private_data; + struct drm_file *priv = filp->private_data; mutex_lock(&dev->struct_mutex); if (drm_sman_owner_clean(&dev_priv->sman, (unsigned long)priv)) { |