summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-03-19 19:26:23 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-19 19:26:23 -0300
commit9120970b21b6c7d5f12afd6569359870295d34d7 (patch)
tree512a77697db0b01d5fa4e7903c1347fc86b78a15
parent6c0cd349e6b4c7acb396fa33b8908bb28899baa9 (diff)
downloadmediapointer-dvb-s2-9120970b21b6c7d5f12afd6569359870295d34d7.tar.gz
mediapointer-dvb-s2-9120970b21b6c7d5f12afd6569359870295d34d7.tar.bz2
au0828: Fix compilation when VIDEO_ADV_DEBUG = n
From: Mauro Carvalho Chehab <mchehab@redhat.com> As reported by Kyle McMartin and Randy Dunlap: drivers/media/video/au0828/au0828-video.c:1438: error: 'const struct v4l2_subdev_core_ops' has no member named 'g_register' drivers/media/video/au0828/au0828-video.c:1453: error: 'const struct v4l2_subdev_core_ops' has no member named 's_register' This patch properly implements those two API ioctls only when debug is enabled. Priority: normal CC: Devin Heitmueller <dheitmueller@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--linux/drivers/media/video/au0828/au0828-video.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/linux/drivers/media/video/au0828/au0828-video.c b/linux/drivers/media/video/au0828/au0828-video.c
index ac5662c59..fc76b2e20 100644
--- a/linux/drivers/media/video/au0828/au0828-video.c
+++ b/linux/drivers/media/video/au0828/au0828-video.c
@@ -1433,6 +1433,7 @@ static int vidioc_streamoff(struct file *file, void *priv,
return 0;
}
+#ifdef CONFIG_VIDEO_ADV_DEBUG
static int vidioc_g_register(struct file *file, void *priv,
struct v4l2_dbg_register *reg)
{
@@ -1463,6 +1464,7 @@ static int vidioc_s_register(struct file *file, void *priv,
}
return 0;
}
+#endif
static int vidioc_reqbufs(struct file *file, void *priv,
struct v4l2_requestbuffers *rb)
@@ -1584,8 +1586,8 @@ static const struct v4l2_ioctl_ops video_ioctl_ops = {
#ifdef CONFIG_VIDEO_ADV_DEBUG
.vidioc_g_register = vidioc_g_register,
.vidioc_s_register = vidioc_s_register,
- .vidioc_g_chip_ident = vidioc_g_chip_ident,
#endif
+ .vidioc_g_chip_ident = vidioc_g_chip_ident,
#ifdef CONFIG_VIDEO_V4L1_COMPAT
.vidiocgmbuf = vidiocgmbuf,
#endif