mirror of
https://github.com/torvalds/linux
synced 2024-10-05 19:02:12 +00:00
[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>
This commit is contained in:
parent
d162e7aac2
commit
49aefd2bcd
|
@ -746,7 +746,7 @@ static int timblogiw_mmap(struct file *file, struct vm_area_struct *vma)
|
||||||
|
|
||||||
/* Platform device functions */
|
/* 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_querycap = timblogiw_querycap,
|
||||||
.vidioc_enum_fmt_vid_cap = timblogiw_enum_fmt,
|
.vidioc_enum_fmt_vid_cap = timblogiw_enum_fmt,
|
||||||
.vidioc_g_fmt_vid_cap = timblogiw_g_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,
|
.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,
|
.owner = THIS_MODULE,
|
||||||
.open = timblogiw_open,
|
.open = timblogiw_open,
|
||||||
.release = timblogiw_close,
|
.release = timblogiw_close,
|
||||||
|
@ -778,7 +778,7 @@ static const __devinitdata struct v4l2_file_operations timblogiw_fops = {
|
||||||
.poll = timblogiw_poll,
|
.poll = timblogiw_poll,
|
||||||
};
|
};
|
||||||
|
|
||||||
static const __devinitdata struct video_device timblogiw_template = {
|
static __devinitconst struct video_device timblogiw_template = {
|
||||||
.name = TIMBLOGIWIN_NAME,
|
.name = TIMBLOGIWIN_NAME,
|
||||||
.fops = &timblogiw_fops,
|
.fops = &timblogiw_fops,
|
||||||
.ioctl_ops = &timblogiw_ioctl_ops,
|
.ioctl_ops = &timblogiw_ioctl_ops,
|
||||||
|
|
Loading…
Reference in a new issue