diff options
Diffstat (limited to 'drivers/media/radio/radio-gemtek-pci.c')
-rw-r--r-- | drivers/media/radio/radio-gemtek-pci.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/media/radio/radio-gemtek-pci.c b/drivers/media/radio/radio-gemtek-pci.c index de49be971480..36e754e3ffb2 100644 --- a/drivers/media/radio/radio-gemtek-pci.c +++ b/drivers/media/radio/radio-gemtek-pci.c | |||
@@ -46,6 +46,7 @@ | |||
46 | #include <linux/pci.h> | 46 | #include <linux/pci.h> |
47 | #include <linux/videodev2.h> | 47 | #include <linux/videodev2.h> |
48 | #include <media/v4l2-common.h> | 48 | #include <media/v4l2-common.h> |
49 | #include <media/v4l2-ioctl.h> | ||
49 | #include <linux/errno.h> | 50 | #include <linux/errno.h> |
50 | 51 | ||
51 | #include <linux/version.h> /* for KERNEL_VERSION MACRO */ | 52 | #include <linux/version.h> /* for KERNEL_VERSION MACRO */ |
@@ -374,11 +375,7 @@ static const struct file_operations gemtek_pci_fops = { | |||
374 | .llseek = no_llseek, | 375 | .llseek = no_llseek, |
375 | }; | 376 | }; |
376 | 377 | ||
377 | static struct video_device vdev_template = { | 378 | static const struct v4l2_ioctl_ops gemtek_pci_ioctl_ops = { |
378 | .owner = THIS_MODULE, | ||
379 | .name = "Gemtek PCI Radio", | ||
380 | .type = VID_TYPE_TUNER, | ||
381 | .fops = &gemtek_pci_fops, | ||
382 | .vidioc_querycap = vidioc_querycap, | 379 | .vidioc_querycap = vidioc_querycap, |
383 | .vidioc_g_tuner = vidioc_g_tuner, | 380 | .vidioc_g_tuner = vidioc_g_tuner, |
384 | .vidioc_s_tuner = vidioc_s_tuner, | 381 | .vidioc_s_tuner = vidioc_s_tuner, |
@@ -393,6 +390,12 @@ static struct video_device vdev_template = { | |||
393 | .vidioc_s_ctrl = vidioc_s_ctrl, | 390 | .vidioc_s_ctrl = vidioc_s_ctrl, |
394 | }; | 391 | }; |
395 | 392 | ||
393 | static struct video_device vdev_template = { | ||
394 | .name = "Gemtek PCI Radio", | ||
395 | .fops = &gemtek_pci_fops, | ||
396 | .ioctl_ops = &gemtek_pci_ioctl_ops, | ||
397 | }; | ||
398 | |||
396 | static int __devinit gemtek_pci_probe( struct pci_dev *pci_dev, const struct pci_device_id *pci_id ) | 399 | static int __devinit gemtek_pci_probe( struct pci_dev *pci_dev, const struct pci_device_id *pci_id ) |
397 | { | 400 | { |
398 | struct gemtek_pci_card *card; | 401 | struct gemtek_pci_card *card; |