diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-08-09 08:52:46 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-08-09 08:52:46 +0200 |
| commit | 15e580283f2654b3455970c404ae363197aa176d (patch) | |
| tree | 37bc78756e24830430727aa5f8ac6bfa51f1d766 /include/drm/drm_ioctl.h | |
| parent | serial: 8250_omap: Handle optional overrun-throttle-ms property (diff) | |
| parent | Linux 5.14-rc5 (diff) | |
| download | linux-15e580283f2654b3455970c404ae363197aa176d.tar.xz linux-15e580283f2654b3455970c404ae363197aa176d.zip | |
Merge 5.14-rc5 into tty-next
We need the tty/serial fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/drm/drm_ioctl.h')
| -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 /** |