diff options
| author | Alan Hourihane <alanh@tungstengraphics.com> | 2008-05-28 21:01:18 +0100 |
|---|---|---|
| committer | Alan Hourihane <alanh@tungstengraphics.com> | 2008-05-28 21:01:18 +0100 |
| commit | 3a3f39d144c47ce937d6924d344a9ad3d82a2db5 (patch) | |
| tree | 109faf867b2e5774d54fe9499dbfebd3f26f014f /bsd-core/drm_scatter.c | |
| parent | 070755af3fecefb6b09e8ef98738e4926e4148a7 (diff) | |
| parent | 5b86823fa36513f521412a38c240cb18f02dcc9a (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
Conflicts:
shared-core/i915_dma.c
shared-core/i915_drv.h
Diffstat (limited to 'bsd-core/drm_scatter.c')
| -rw-r--r-- | bsd-core/drm_scatter.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/bsd-core/drm_scatter.c b/bsd-core/drm_scatter.c index 92e715e0..3ebd4628 100644 --- a/bsd-core/drm_scatter.c +++ b/bsd-core/drm_scatter.c @@ -45,7 +45,7 @@ void drm_sg_cleanup(drm_sg_mem_t *entry) free(entry, M_DRM); } -int drm_sg_alloc(drm_device_t * dev, drm_scatter_gather_t * request) +int drm_sg_alloc(struct drm_device * dev, drm_scatter_gather_t * request) { drm_sg_mem_t *entry; unsigned long pages; @@ -98,7 +98,8 @@ int drm_sg_alloc(drm_device_t * dev, drm_scatter_gather_t * request) return 0; } -int drm_sg_alloc_ioctl(drm_device_t *dev, void *data, struct drm_file *file_priv) +int drm_sg_alloc_ioctl(struct drm_device *dev, void *data, + struct drm_file *file_priv) { drm_scatter_gather_t *request = data; int ret; @@ -109,7 +110,7 @@ int drm_sg_alloc_ioctl(drm_device_t *dev, void *data, struct drm_file *file_priv return ret; } -int drm_sg_free(drm_device_t *dev, void *data, struct drm_file *file_priv) +int drm_sg_free(struct drm_device *dev, void *data, struct drm_file *file_priv) { drm_scatter_gather_t *request = data; drm_sg_mem_t *entry; |