diff options
| author | Dave Airlie <airlied@redhat.com> | 2021-07-26 02:27:59 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2021-07-26 02:27:59 +0300 |
| commit | 35482f9dc56b9bd0f179106da7e461f6c2a2d891 (patch) | |
| tree | b04c95e464c3724b5b5b0ba50ad4a26886b2497a /include/drm | |
| parent | 8da49a33dda7294c1af508f8aa81cd638d0afd62 (diff) | |
| parent | ff1176468d368232b684f75e82563369208bc371 (diff) | |
| download | linux-35482f9dc56b9bd0f179106da7e461f6c2a2d891.tar.xz | |
Backmerge tag 'v5.14-rc3' into drm-next
Linux 5.14-rc3
Daniel said we should pull the nouveau fix from fixes in here, probably
a good plan.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'include/drm')
| -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 10100a4bbe2a..afb27cb6a7bd 100644 --- a/include/drm/drm_ioctl.h +++ b/include/drm/drm_ioctl.h @@ -68,6 +68,7 @@ typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd, unsigned long arg); #define DRM_IOCTL_NR(n) _IOC_NR(n) +#define DRM_IOCTL_TYPE(n) _IOC_TYPE(n) #define DRM_MAJOR 226 /** |