Merge branch 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt...

[sfrench/cifs-2.6.git] / drivers / gpu / drm / i915 / i915_drv.c

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index a0a2cad8c0162669e8aefa0cf4952b53d09e65f2..2ffffd7ae09adb580706ed46304a489606da83bb 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -488,7 +488,7 @@ static struct drm_driver driver = {
                 .owner = THIS_MODULE,
                 .open = drm_open,
                 .release = drm_release,
                 .owner = THIS_MODULE,
                 .open = drm_open,
                 .release = drm_release,

-                .ioctl = drm_ioctl,
+                .unlocked_ioctl = drm_ioctl,

                 .mmap = drm_gem_mmap,
                 .poll = drm_poll,
                 .fasync = drm_fasync,
                 .mmap = drm_gem_mmap,
                 .poll = drm_poll,
                 .fasync = drm_fasync,