From 8baeb90019ef5904ba1364b96c0da7c7627062c7 Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Mon, 22 Nov 2010 23:35:17 -0300 Subject: [PATCH] --- yaml --- r: 226306 b: refs/heads/master c: 49aefd2bcda80d33497f0f26702c67e372cacef3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/timblogiw.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 21b6cd22a02a..13c58c31ebbe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d162e7aac24bfd8b96881582368f976e7e464c25 +refs/heads/master: 49aefd2bcda80d33497f0f26702c67e372cacef3 diff --git a/trunk/drivers/media/video/timblogiw.c b/trunk/drivers/media/video/timblogiw.c index bddcdb6ffef5..cf48aa934b8c 100644 --- a/trunk/drivers/media/video/timblogiw.c +++ b/trunk/drivers/media/video/timblogiw.c @@ -746,7 +746,7 @@ static int timblogiw_mmap(struct file *file, struct vm_area_struct *vma) /* Platform device functions */ -static const __devinitdata struct v4l2_ioctl_ops timblogiw_ioctl_ops = { +static __devinitconst struct v4l2_ioctl_ops timblogiw_ioctl_ops = { .vidioc_querycap = timblogiw_querycap, .vidioc_enum_fmt_vid_cap = timblogiw_enum_fmt, .vidioc_g_fmt_vid_cap = timblogiw_g_fmt, @@ -768,7 +768,7 @@ static const __devinitdata struct v4l2_ioctl_ops timblogiw_ioctl_ops = { .vidioc_enum_framesizes = timblogiw_enum_framesizes, }; -static const __devinitdata struct v4l2_file_operations timblogiw_fops = { +static __devinitconst struct v4l2_file_operations timblogiw_fops = { .owner = THIS_MODULE, .open = timblogiw_open, .release = timblogiw_close, @@ -778,7 +778,7 @@ static const __devinitdata struct v4l2_file_operations timblogiw_fops = { .poll = timblogiw_poll, }; -static const __devinitdata struct video_device timblogiw_template = { +static __devinitconst struct video_device timblogiw_template = { .name = TIMBLOGIWIN_NAME, .fops = &timblogiw_fops, .ioctl_ops = &timblogiw_ioctl_ops,