diff options
author | Patrice Mandin <pmandin@caramail.com> | 2007-08-02 20:08:05 +0200 |
---|---|---|
committer | Patrice Mandin <pmandin@caramail.com> | 2007-08-02 20:08:05 +0200 |
commit | 9dfcc1ba07b6ad1a41234ae4016b54444094ac18 (patch) | |
tree | c0deaa0f308616f35eabfda98d83814a8d405fed /linux-core/drmP.h | |
parent | 405c48b857a967c1174b27a5db975668e1d6a9f8 (diff) | |
parent | 7602e4f8a67d777437502672b4f74d9b990535ce (diff) |
Merge branch 'master' of git+ssh://pmandin@git.freedesktop.org/git/mesa/drm
Diffstat (limited to 'linux-core/drmP.h')
-rw-r--r-- | linux-core/drmP.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/linux-core/drmP.h b/linux-core/drmP.h index 2b7e0a44..a61efcff 100644 --- a/linux-core/drmP.h +++ b/linux-core/drmP.h @@ -911,6 +911,8 @@ extern void drm_exit(struct drm_driver *driver); extern void drm_cleanup_pci(struct pci_dev *pdev); extern int drm_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg); +extern long drm_unlocked_ioctl(struct file *filp, + unsigned int cmd, unsigned long arg); extern long drm_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg); |