diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2012-09-26 21:07:20 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-09-26 21:07:20 -0400 |
| commit | 5905db5ca0ac9a6d5bfe87f86b87cd1bdec3755a (patch) | |
| tree | 6edb13ed37d842ef0b70d072b94e4c78010f90cf /drivers/gpu/drm/cirrus/cirrus_drv.c | |
| parent | c5aa1e554a20fb3542c62688ae46049c9225a965 (diff) | |
| parent | 6f0f9b6b3fcfe5e156f20d4f804f0d505c750b3c (diff) | |
Merge remote branch 'origin' into for-next
Diffstat (limited to 'drivers/gpu/drm/cirrus/cirrus_drv.c')
| -rw-r--r-- | drivers/gpu/drm/cirrus/cirrus_drv.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/cirrus/cirrus_drv.c b/drivers/gpu/drm/cirrus/cirrus_drv.c index 7053140c659..b83a2d7ddd1 100644 --- a/drivers/gpu/drm/cirrus/cirrus_drv.c +++ b/drivers/gpu/drm/cirrus/cirrus_drv.c @@ -74,6 +74,9 @@ static const struct file_operations cirrus_driver_fops = { .unlocked_ioctl = drm_ioctl, .mmap = cirrus_mmap, .poll = drm_poll, +#ifdef CONFIG_COMPAT + .compat_ioctl = drm_compat_ioctl, +#endif .fasync = drm_fasync, }; static struct drm_driver driver = { |