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-11 09:04:06 -0200 |
| commit | b24975c9521497d1d3b1391a42b7f65a87ae99c8 (patch) | |
| tree | 7509767ae6c1d18575915e7c0d92af810f952069 | |
| parent | 665d4980b646fbd806d676c8abfb88aabe722f58 (diff) | |
| download | lwn-b24975c9521497d1d3b1391a42b7f65a87ae99c8.tar.gz lwn-b24975c9521497d1d3b1391a42b7f65a87ae99c8.zip | |
[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 48989e5de1fa..93867893f68a 100644 --- a/drivers/media/video/timblogiw.c +++ b/drivers/media/video/timblogiw.c @@ -747,7 +747,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, @@ -769,7 +769,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, @@ -779,7 +779,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, |