Skip to content

Commit

Permalink
[media] timblogiw: const and __devinitdata do not mix
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Stephen Rothwell authored and Mauro Carvalho Chehab committed Dec 29, 2010
1 parent d162e7a commit 49aefd2
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/media/video/timblogiw.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand Down

0 comments on commit 49aefd2

Please sign in to comment.