diff options
Diffstat (limited to 'drivers/media/radio/radio-aztech.c')
-rw-r--r-- | drivers/media/radio/radio-aztech.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/media/radio/radio-aztech.c b/drivers/media/radio/radio-aztech.c index 46cdb549eac..3fe5504428c 100644 --- a/drivers/media/radio/radio-aztech.c +++ b/drivers/media/radio/radio-aztech.c | |||
@@ -33,6 +33,7 @@ | |||
33 | #include <asm/uaccess.h> /* copy to/from user */ | 33 | #include <asm/uaccess.h> /* copy to/from user */ |
34 | #include <linux/videodev2.h> /* kernel radio structs */ | 34 | #include <linux/videodev2.h> /* kernel radio structs */ |
35 | #include <media/v4l2-common.h> | 35 | #include <media/v4l2-common.h> |
36 | #include <media/v4l2-ioctl.h> | ||
36 | 37 | ||
37 | #include <linux/version.h> /* for KERNEL_VERSION MACRO */ | 38 | #include <linux/version.h> /* for KERNEL_VERSION MACRO */ |
38 | #define RADIO_VERSION KERNEL_VERSION(0,0,2) | 39 | #define RADIO_VERSION KERNEL_VERSION(0,0,2) |
@@ -352,12 +353,7 @@ static const struct file_operations aztech_fops = { | |||
352 | .llseek = no_llseek, | 353 | .llseek = no_llseek, |
353 | }; | 354 | }; |
354 | 355 | ||
355 | static struct video_device aztech_radio= | 356 | static const struct v4l2_ioctl_ops aztech_ioctl_ops = { |
356 | { | ||
357 | .owner = THIS_MODULE, | ||
358 | .name = "Aztech radio", | ||
359 | .type = VID_TYPE_TUNER, | ||
360 | .fops = &aztech_fops, | ||
361 | .vidioc_querycap = vidioc_querycap, | 357 | .vidioc_querycap = vidioc_querycap, |
362 | .vidioc_g_tuner = vidioc_g_tuner, | 358 | .vidioc_g_tuner = vidioc_g_tuner, |
363 | .vidioc_s_tuner = vidioc_s_tuner, | 359 | .vidioc_s_tuner = vidioc_s_tuner, |
@@ -372,6 +368,12 @@ static struct video_device aztech_radio= | |||
372 | .vidioc_s_ctrl = vidioc_s_ctrl, | 368 | .vidioc_s_ctrl = vidioc_s_ctrl, |
373 | }; | 369 | }; |
374 | 370 | ||
371 | static struct video_device aztech_radio = { | ||
372 | .name = "Aztech radio", | ||
373 | .fops = &aztech_fops, | ||
374 | .ioctl_ops = &aztech_ioctl_ops, | ||
375 | }; | ||
376 | |||
375 | module_param_named(debug,aztech_radio.debug, int, 0644); | 377 | module_param_named(debug,aztech_radio.debug, int, 0644); |
376 | MODULE_PARM_DESC(debug,"activates debug info"); | 378 | MODULE_PARM_DESC(debug,"activates debug info"); |
377 | 379 | ||