Use unlocked_ioctl rather than ioctl
authorThomas White <taw@bitwiz.org.uk>
Mon, 24 May 2010 19:49:14 +0000 (21:49 +0200)
committerThomas White <taw@bitwiz.org.uk>
Mon, 24 May 2010 19:49:14 +0000 (21:49 +0200)
The arguments changed between 2.6.32 and 2.6.34.

Signed-off-by: Thomas White <taw@bitwiz.org.uk>
drivers/mfd/glamo/glamo-drm-drv.c

index 4f982ad..75b5233 100644 (file)
@@ -179,7 +179,7 @@ static struct drm_driver glamodrm_drm_driver = {
                .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,