aboutsummaryrefslogtreecommitdiff
path: root/include/drm/drmP.h
diff options
context:
space:
mode:
authorFelix Blyakher <felixb@sgi.com>2009-03-03 09:18:47 -0600
committerFelix Blyakher <felixb@sgi.com>2009-03-03 09:18:47 -0600
commitd4fc7cea5dda04ae1a6f36175ec1dd8ff088ed52 (patch)
tree3d65887b06c575a94feed1fd91216e32a62b31d8 /include/drm/drmP.h
parent3a011a171906a3a51a43bb860fb7c66a64cab140 (diff)
parent2450cf51a1bdba7037e91b1bcc494b01c58aaf66 (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/drm/drmP.h')
-rw-r--r--include/drm/drmP.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index 8190b9bcc2d..e5f4ae989ab 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -1321,6 +1321,8 @@ void drm_gem_object_free(struct kref *kref);
struct drm_gem_object *drm_gem_object_alloc(struct drm_device *dev,
size_t size);
void drm_gem_object_handle_free(struct kref *kref);
+void drm_gem_vm_open(struct vm_area_struct *vma);
+void drm_gem_vm_close(struct vm_area_struct *vma);
int drm_gem_mmap(struct file *filp, struct vm_area_struct *vma);
static inline void