diff options
Diffstat (limited to 'drivers/media/radio/radio-trust.c')
-rw-r--r-- | drivers/media/radio/radio-trust.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/media/radio/radio-trust.c b/drivers/media/radio/radio-trust.c index 4ebdfbadeb9c..d70172d23edb 100644 --- a/drivers/media/radio/radio-trust.c +++ b/drivers/media/radio/radio-trust.c | |||
@@ -23,6 +23,7 @@ | |||
23 | #include <asm/uaccess.h> | 23 | #include <asm/uaccess.h> |
24 | #include <linux/videodev2.h> | 24 | #include <linux/videodev2.h> |
25 | #include <media/v4l2-common.h> | 25 | #include <media/v4l2-common.h> |
26 | #include <media/v4l2-ioctl.h> | ||
26 | 27 | ||
27 | #include <linux/version.h> /* for KERNEL_VERSION MACRO */ | 28 | #include <linux/version.h> /* for KERNEL_VERSION MACRO */ |
28 | #define RADIO_VERSION KERNEL_VERSION(0,0,2) | 29 | #define RADIO_VERSION KERNEL_VERSION(0,0,2) |
@@ -346,12 +347,7 @@ static const struct file_operations trust_fops = { | |||
346 | .llseek = no_llseek, | 347 | .llseek = no_llseek, |
347 | }; | 348 | }; |
348 | 349 | ||
349 | static struct video_device trust_radio= | 350 | static const struct v4l2_ioctl_ops trust_ioctl_ops = { |
350 | { | ||
351 | .owner = THIS_MODULE, | ||
352 | .name = "Trust FM Radio", | ||
353 | .type = VID_TYPE_TUNER, | ||
354 | .fops = &trust_fops, | ||
355 | .vidioc_querycap = vidioc_querycap, | 351 | .vidioc_querycap = vidioc_querycap, |
356 | .vidioc_g_tuner = vidioc_g_tuner, | 352 | .vidioc_g_tuner = vidioc_g_tuner, |
357 | .vidioc_s_tuner = vidioc_s_tuner, | 353 | .vidioc_s_tuner = vidioc_s_tuner, |
@@ -366,6 +362,12 @@ static struct video_device trust_radio= | |||
366 | .vidioc_s_input = vidioc_s_input, | 362 | .vidioc_s_input = vidioc_s_input, |
367 | }; | 363 | }; |
368 | 364 | ||
365 | static struct video_device trust_radio = { | ||
366 | .name = "Trust FM Radio", | ||
367 | .fops = &trust_fops, | ||
368 | .ioctl_ops = &trust_ioctl_ops, | ||
369 | }; | ||
370 | |||
369 | static int __init trust_init(void) | 371 | static int __init trust_init(void) |
370 | { | 372 | { |
371 | if(io == -1) { | 373 | if(io == -1) { |