r5u870

commit 046c982a201c6ebd986949eecab4e311c42f8fc6
parent 77c4f8114eaa89f4d1fd9ccf9bfcd0c536c42c27
Author: alex <alex@022568fa-442e-4ef8-a3e8-54dcafdb011a>
Date:   Sun, 14 Dec 2008 22:47:04 +0000

Patch from Prarit Bhargava <prarit@redhat.com> that fixes compilation on 2.6.27 kernels.


git-svn-id: http://svn.mediati.org/svn/r5u870/trunk@108 022568fa-442e-4ef8-a3e8-54dcafdb011a

Diffstat:
M
usbcam/usbcam_fops.c
 | 
25
+++++++++++++++----------

1 file changed, 15 insertions(+), 10 deletions(-)
diff --git a/usbcam/usbcam_fops.c b/usbcam/usbcam_fops.c
@@ -21,6 +21,7 @@
  */
 
 #include "usbcam_priv.h"
+#include "media/v4l2-ioctl.h"
 
 /*
  * This file contains the file_operations implementation
@@ -1208,17 +1209,12 @@ struct file_operations usbcam_v4l_fops_template = {
  * This gets installed via video_register_device() from usb_usbcam_probe().
  */
 
-struct video_device usbcam_videodev_template = {
-	.name			= "usbcam-unknown",
-	.type			= VFL_TYPE_GRABBER,
-	.type2			= VID_TYPE_CAPTURE,
-	.minor			= -1,
-
+static const struct v4l2_ioctl_ops this_cam_ops = {
 	.vidioc_querycap	= usbcam_v4l_vidioc_querycap,
-	.vidioc_enum_fmt_cap	= usbcam_v4l_vidioc_enum_fmt_cap,
-	.vidioc_g_fmt_cap	= usbcam_v4l_vidioc_g_fmt_cap,
-	.vidioc_s_fmt_cap	= usbcam_v4l_vidioc_s_fmt_cap,
-	.vidioc_try_fmt_cap	= usbcam_v4l_vidioc_try_fmt_cap,
+	.vidioc_enum_fmt_vid_cap	= usbcam_v4l_vidioc_enum_fmt_cap,
+	.vidioc_g_fmt_vid_cap	= usbcam_v4l_vidioc_g_fmt_cap,
+	.vidioc_s_fmt_vid_cap	= usbcam_v4l_vidioc_s_fmt_cap,
+	.vidioc_try_fmt_vid_cap	= usbcam_v4l_vidioc_try_fmt_cap,
 	.vidioc_reqbufs		= usbcam_v4l_vidioc_reqbufs,
 	.vidioc_querybuf	= usbcam_v4l_vidioc_querybuf,
 	.vidioc_qbuf		= usbcam_v4l_vidioc_qbuf,
@@ -1234,3 +1230,12 @@ struct video_device usbcam_videodev_template = {
 	.vidioc_s_ctrl		= usbcam_v4l_vidioc_s_ctrl,
 	.vidioc_querymenu	= usbcam_v4l_vidioc_querymenu,
 };
+
+struct video_device usbcam_videodev_template = {
+	.name			= "usbcam-unknown",
+	.vfl_type		= VFL_TYPE_GRABBER,
+	.minor			= -1,
+	.ioctl_ops		= &this_cam_ops,
+
+};
+