aboutsummaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2013-04-06 06:16:58 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-04-14 19:47:33 -0300
commit96b03d2a3078d5e95a8b106634faa7cea88ebe5e (patch)
tree22f781d017cf9f27fa61a8577d896993a1e82f08 /include/media
parent[media] v4l2-ioctl: fill in name before calling vidioc_g_chip_name (diff)
downloadlinux-dev-96b03d2a3078d5e95a8b106634faa7cea88ebe5e.tar.xz
linux-dev-96b03d2a3078d5e95a8b106634faa7cea88ebe5e.zip
[media] v4l2: rename VIDIOC_DBG_G_CHIP_NAME to _CHIP_INFO
This ioctl will be extended to return more information than just the name. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include/media')
-rw-r--r--include/media/v4l2-ioctl.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/media/v4l2-ioctl.h b/include/media/v4l2-ioctl.h
index 6b917d69e408..931652f0e2af 100644
--- a/include/media/v4l2-ioctl.h
+++ b/include/media/v4l2-ioctl.h
@@ -244,8 +244,8 @@ struct v4l2_ioctl_ops {
int (*vidioc_s_register) (struct file *file, void *fh,
const struct v4l2_dbg_register *reg);
- int (*vidioc_g_chip_name) (struct file *file, void *fh,
- struct v4l2_dbg_chip_name *chip);
+ int (*vidioc_g_chip_info) (struct file *file, void *fh,
+ struct v4l2_dbg_chip_info *chip);
#endif
int (*vidioc_g_chip_ident) (struct file *file, void *fh,
struct v4l2_dbg_chip_ident *chip);