summaryrefslogtreecommitdiffstats
path: root/drivers/staging/tm6000
diff options
context:
space:
mode:
authorStefan Ringel <stefan.ringel@arcor.de>2011-05-09 16:54:01 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-05-20 20:08:13 -0300
commit1f385717c923bf5ca0a60de22c892e466d4edf0f (patch)
treeddbef7946ccc96da28e8fbac44934041d530615b /drivers/staging/tm6000
parent7ecff8c93e14226e0c39d930b633d5ade78526cc (diff)
downloadblackbird-op-linux-1f385717c923bf5ca0a60de22c892e466d4edf0f.tar.gz
blackbird-op-linux-1f385717c923bf5ca0a60de22c892e466d4edf0f.zip
[media] tm6000: change from ioctl to unlocked_ioctl
Signed-off-by: Stefan Ringel <stefan.ringel@arcor.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/staging/tm6000')
-rw-r--r--drivers/staging/tm6000/tm6000-video.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/tm6000/tm6000-video.c b/drivers/staging/tm6000/tm6000-video.c
index ea5ad6c77206..2d83204883ad 100644
--- a/drivers/staging/tm6000/tm6000-video.c
+++ b/drivers/staging/tm6000/tm6000-video.c
@@ -1666,10 +1666,10 @@ static struct video_device tm6000_template = {
};
static const struct v4l2_file_operations radio_fops = {
- .owner = THIS_MODULE,
- .open = tm6000_open,
- .release = tm6000_release,
- .ioctl = video_ioctl2,
+ .owner = THIS_MODULE,
+ .open = tm6000_open,
+ .release = tm6000_release,
+ .unlocked_ioctl = video_ioctl2,
};
static const struct v4l2_ioctl_ops radio_ioctl_ops = {
OpenPOWER on IntegriCloud