diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-11-22 23:35:17 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-12-29 08:17:00 -0200 |
| commit | 49aefd2bcda80d33497f0f26702c67e372cacef3 (patch) | |
| tree | be0de1c48d04a18229e16836f046b9b527b93960 | |
| parent | d162e7aac24bfd8b96881582368f976e7e464c25 (diff) | |
| download | kernel_samsung_aries-49aefd2bcda80d33497f0f26702c67e372cacef3.zip kernel_samsung_aries-49aefd2bcda80d33497f0f26702c67e372cacef3.tar.gz kernel_samsung_aries-49aefd2bcda80d33497f0f26702c67e372cacef3.tar.bz2 | |
[media] timblogiw: const and __devinitdata do not mix
This fixes the following error in PowerPC builds:
drivers/media/video/timblogiw.c: In function 'timblogiw_probe':
drivers/media/video/timblogiw.c:749: error: timblogiw_ioctl_ops causes a section type conflict
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| -rw-r--r-- | drivers/media/video/timblogiw.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/timblogiw.c b/drivers/media/video/timblogiw.c index bddcdb6..cf48aa9 100644 --- a/drivers/media/video/timblogiw.c +++ b/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, |