aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas White <taw@bitwiz.org.uk>2010-05-24 21:49:14 +0200
committerThomas White <taw@bitwiz.org.uk>2010-05-24 21:49:14 +0200
commitea9d004f7b0d5c93610a2abdcbdf54af2a871c4b (patch)
treec8267a775729d00229e4fe1cbccc77cc867f706d
parent92118a72fdf779a20693cb7d01d1a12fc8e12ace (diff)
Use unlocked_ioctl rather than ioctl
The arguments changed between 2.6.32 and 2.6.34. Signed-off-by: Thomas White <taw@bitwiz.org.uk>
-rw-r--r--drivers/mfd/glamo/glamo-drm-drv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/glamo/glamo-drm-drv.c b/drivers/mfd/glamo/glamo-drm-drv.c
index 4f982ad2619..75b52331d4c 100644
--- a/drivers/mfd/glamo/glamo-drm-drv.c
+++ b/drivers/mfd/glamo/glamo-drm-drv.c
@@ -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,