1 files changed, 14 insertions, 11 deletions

diff --git a/drivers/media/video/cafe_ccic.c b/drivers/media/video/cafe_ccic.c
index 302c57f151c..4bbea458d0c 100644
--- a/drivers/media/video/cafe_ccic.c
+++ b/drivers/media/video/cafe_ccic.c
@@ -1769,17 +1769,7 @@ static const struct file_operations cafe_v4l_fops = {
         .llseek = no_llseek,
 };
 
-static struct video_device cafe_v4l_template = {
-        .name = "cafe",
-        .type = VFL_TYPE_GRABBER,
-        .type2 = VID_TYPE_CAPTURE,
-        .minor = -1, /* Get one dynamically */
-        .tvnorms = V4L2_STD_NTSC_M,
-        .current_norm = V4L2_STD_NTSC_M,  /* make mplayer happy */
-
-        .fops = &cafe_v4l_fops,
-        .release = cafe_v4l_dev_release,
-
+static const struct v4l2_ioctl_ops cafe_v4l_ioctl_ops = {
         .vidioc_querycap        = cafe_vidioc_querycap,
         .vidioc_enum_fmt_vid_cap = cafe_vidioc_enum_fmt_vid_cap,
         .vidioc_try_fmt_vid_cap = cafe_vidioc_try_fmt_vid_cap,
@@ -1802,6 +1792,19 @@ static struct video_device cafe_v4l_template = {
         .vidioc_s_parm          = cafe_vidioc_s_parm,
 };
 
+static struct video_device cafe_v4l_template = {
+        .name = "cafe",
+        .type = VFL_TYPE_GRABBER,
+        .type2 = VID_TYPE_CAPTURE,
+        .minor = -1, /* Get one dynamically */
+        .tvnorms = V4L2_STD_NTSC_M,
+        .current_norm = V4L2_STD_NTSC_M,  /* make mplayer happy */
+
+        .fops = &cafe_v4l_fops,
+        .ioctl_ops = &cafe_v4l_ioctl_ops,
+        .release = cafe_v4l_dev_release,
+};
+