diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-08-07 04:55:03 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-08-07 04:55:03 -0400 |
commit | 4fb8af10d0fd09372d52966b76922b9e82bbc950 (patch) | |
tree | d240e4d40357583e3f3eb228dccf20122a5b31ed /drivers/media/video/pvrusb2/pvrusb2-v4l2.c | |
parent | f44f82e8a20b98558486eb14497b2f71c78fa325 (diff) | |
parent | 64a99d2a8c3ed5c4e39f3ae1cc682aa8fd3977fc (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes
Diffstat (limited to 'drivers/media/video/pvrusb2/pvrusb2-v4l2.c')
-rw-r--r-- | drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c index 0d72dc470fef..00306faeac01 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c +++ b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c | |||
@@ -30,6 +30,7 @@ | |||
30 | #include <linux/videodev2.h> | 30 | #include <linux/videodev2.h> |
31 | #include <media/v4l2-dev.h> | 31 | #include <media/v4l2-dev.h> |
32 | #include <media/v4l2-common.h> | 32 | #include <media/v4l2-common.h> |
33 | #include <media/v4l2-ioctl.h> | ||
33 | 34 | ||
34 | struct pvr2_v4l2_dev; | 35 | struct pvr2_v4l2_dev; |
35 | struct pvr2_v4l2_fh; | 36 | struct pvr2_v4l2_fh; |
@@ -1160,11 +1161,6 @@ static const struct file_operations vdev_fops = { | |||
1160 | 1161 | ||
1161 | 1162 | ||
1162 | static struct video_device vdev_template = { | 1163 | static struct video_device vdev_template = { |
1163 | .owner = THIS_MODULE, | ||
1164 | .type = VID_TYPE_CAPTURE | VID_TYPE_TUNER, | ||
1165 | .type2 = (V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_VBI_CAPTURE | ||
1166 | | V4L2_CAP_TUNER | V4L2_CAP_AUDIO | ||
1167 | | V4L2_CAP_READWRITE), | ||
1168 | .fops = &vdev_fops, | 1164 | .fops = &vdev_fops, |
1169 | }; | 1165 | }; |
1170 | 1166 | ||