diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2017-07-04 13:31:18 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2017-07-04 13:31:18 -0400 |
| commit | f2cffa223afaca0c8297793581bb857dc364542c (patch) | |
| tree | c1658666414d1c89d8aecd65340c33c132c81a45 /include | |
| parent | 8d1a81a852f58c5708cd607dcbe36eb32da5cbeb (diff) | |
| parent | aeba03903063e9fea885d32318e1546d9b7e83a8 (diff) | |
| download | cachepc-linux-f2cffa223afaca0c8297793581bb857dc364542c.tar.gz cachepc-linux-f2cffa223afaca0c8297793581bb857dc364542c.zip | |
Merge branch 'work.drm' into work.__copy_in_user
Diffstat (limited to 'include')
| -rw-r--r-- | include/drm/drm_ioctl.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/drm/drm_ioctl.h b/include/drm/drm_ioctl.h index ee03b3c44b3b..add42809642a 100644 --- a/include/drm/drm_ioctl.h +++ b/include/drm/drm_ioctl.h @@ -172,6 +172,7 @@ struct drm_ioctl_desc { int drm_ioctl_permit(u32 flags, struct drm_file *file_priv); long drm_ioctl(struct file *filp, unsigned int cmd, unsigned long arg); +long drm_ioctl_kernel(struct file *, drm_ioctl_t, void *, u32); #ifdef CONFIG_COMPAT long drm_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg); #else |