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_fops.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_fops.c')
| -rw-r--r-- | bsd-core/drm_fops.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bsd-core/drm_fops.c b/bsd-core/drm_fops.c index 20bae8d7..062b1d59 100644 --- a/bsd-core/drm_fops.c +++ b/bsd-core/drm_fops.c @@ -36,7 +36,7 @@ #include "drmP.h" -drm_file_t *drm_find_file_by_proc(drm_device_t *dev, DRM_STRUCTPROC *p) +drm_file_t *drm_find_file_by_proc(struct drm_device *dev, DRM_STRUCTPROC *p) { #if __FreeBSD_version >= 500021 uid_t uid = p->td_ucred->cr_svuid; @@ -57,7 +57,7 @@ drm_file_t *drm_find_file_by_proc(drm_device_t *dev, DRM_STRUCTPROC *p) /* drm_open_helper is called whenever a process opens /dev/drm. */ int drm_open_helper(struct cdev *kdev, int flags, int fmt, DRM_STRUCTPROC *p, - drm_device_t *dev) + struct drm_device *dev) { int m = minor(kdev); drm_file_t *priv; |