diff options
Diffstat (limited to 'drivers/media/radio/radio-terratec.c')
-rw-r--r-- | drivers/media/radio/radio-terratec.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/media/radio/radio-terratec.c b/drivers/media/radio/radio-terratec.c index acc32080e9bd..cefa44fc5aed 100644 --- a/drivers/media/radio/radio-terratec.c +++ b/drivers/media/radio/radio-terratec.c | |||
@@ -32,6 +32,7 @@ | |||
32 | #include <asm/uaccess.h> /* copy to/from user */ | 32 | #include <asm/uaccess.h> /* copy to/from user */ |
33 | #include <linux/videodev2.h> /* kernel radio structs */ | 33 | #include <linux/videodev2.h> /* kernel radio structs */ |
34 | #include <media/v4l2-common.h> | 34 | #include <media/v4l2-common.h> |
35 | #include <media/v4l2-ioctl.h> | ||
35 | #include <linux/spinlock.h> | 36 | #include <linux/spinlock.h> |
36 | 37 | ||
37 | #include <linux/version.h> /* for KERNEL_VERSION MACRO */ | 38 | #include <linux/version.h> /* for KERNEL_VERSION MACRO */ |
@@ -366,12 +367,7 @@ static const struct file_operations terratec_fops = { | |||
366 | .llseek = no_llseek, | 367 | .llseek = no_llseek, |
367 | }; | 368 | }; |
368 | 369 | ||
369 | static struct video_device terratec_radio= | 370 | static const struct v4l2_ioctl_ops terratec_ioctl_ops = { |
370 | { | ||
371 | .owner = THIS_MODULE, | ||
372 | .name = "TerraTec ActiveRadio", | ||
373 | .type = VID_TYPE_TUNER, | ||
374 | .fops = &terratec_fops, | ||
375 | .vidioc_querycap = vidioc_querycap, | 371 | .vidioc_querycap = vidioc_querycap, |
376 | .vidioc_g_tuner = vidioc_g_tuner, | 372 | .vidioc_g_tuner = vidioc_g_tuner, |
377 | .vidioc_s_tuner = vidioc_s_tuner, | 373 | .vidioc_s_tuner = vidioc_s_tuner, |
@@ -386,6 +382,12 @@ static struct video_device terratec_radio= | |||
386 | .vidioc_s_input = vidioc_s_input, | 382 | .vidioc_s_input = vidioc_s_input, |
387 | }; | 383 | }; |
388 | 384 | ||
385 | static struct video_device terratec_radio = { | ||
386 | .name = "TerraTec ActiveRadio", | ||
387 | .fops = &terratec_fops, | ||
388 | .ioctl_ops = &terratec_ioctl_ops, | ||
389 | }; | ||
390 | |||
389 | static int __init terratec_init(void) | 391 | static int __init terratec_init(void) |
390 | { | 392 | { |
391 | if(io==-1) | 393 | if(io==-1) |