aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/media/v4l2-ioctl.h4
-rw-r--r--include/uapi/linux/videodev2.h8
2 files changed, 6 insertions, 6 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 {
244 int (*vidioc_s_register) (struct file *file, void *fh, 244 int (*vidioc_s_register) (struct file *file, void *fh,
245 const struct v4l2_dbg_register *reg); 245 const struct v4l2_dbg_register *reg);
246 246
247 int (*vidioc_g_chip_name) (struct file *file, void *fh, 247 int (*vidioc_g_chip_info) (struct file *file, void *fh,
248 struct v4l2_dbg_chip_name *chip); 248 struct v4l2_dbg_chip_info *chip);
249#endif 249#endif
250 int (*vidioc_g_chip_ident) (struct file *file, void *fh, 250 int (*vidioc_g_chip_ident) (struct file *file, void *fh,
251 struct v4l2_dbg_chip_ident *chip); 251 struct v4l2_dbg_chip_ident *chip);
diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
index 4c941c103c44..be43b4659527 100644
--- a/include/uapi/linux/videodev2.h
+++ b/include/uapi/linux/videodev2.h
@@ -1839,8 +1839,8 @@ struct v4l2_dbg_chip_ident {
1839#define V4L2_CHIP_FL_READABLE (1 << 0) 1839#define V4L2_CHIP_FL_READABLE (1 << 0)
1840#define V4L2_CHIP_FL_WRITABLE (1 << 1) 1840#define V4L2_CHIP_FL_WRITABLE (1 << 1)
1841 1841
1842/* VIDIOC_DBG_G_CHIP_NAME */ 1842/* VIDIOC_DBG_G_CHIP_INFO */
1843struct v4l2_dbg_chip_name { 1843struct v4l2_dbg_chip_info {
1844 struct v4l2_dbg_match match; 1844 struct v4l2_dbg_match match;
1845 char name[32]; 1845 char name[32];
1846 __u32 flags; 1846 __u32 flags;
@@ -1938,7 +1938,7 @@ struct v4l2_create_buffers {
1938 1938
1939/* Experimental, meant for debugging, testing and internal use. 1939/* Experimental, meant for debugging, testing and internal use.
1940 Never use this ioctl in applications! 1940 Never use this ioctl in applications!
1941 Note: this ioctl is deprecated in favor of VIDIOC_DBG_G_CHIP_NAME and 1941 Note: this ioctl is deprecated in favor of VIDIOC_DBG_G_CHIP_INFO and
1942 will go away in the future. */ 1942 will go away in the future. */
1943#define VIDIOC_DBG_G_CHIP_IDENT _IOWR('V', 81, struct v4l2_dbg_chip_ident) 1943#define VIDIOC_DBG_G_CHIP_IDENT _IOWR('V', 81, struct v4l2_dbg_chip_ident)
1944 1944
@@ -1976,7 +1976,7 @@ struct v4l2_create_buffers {
1976 1976
1977/* Experimental, meant for debugging, testing and internal use. 1977/* Experimental, meant for debugging, testing and internal use.
1978 Never use these in applications! */ 1978 Never use these in applications! */
1979#define VIDIOC_DBG_G_CHIP_NAME _IOWR('V', 102, struct v4l2_dbg_chip_name) 1979#define VIDIOC_DBG_G_CHIP_INFO _IOWR('V', 102, struct v4l2_dbg_chip_info)
1980 1980
1981/* Reminder: when adding new ioctls please add support for them to 1981/* Reminder: when adding new ioctls please add support for them to
1982 drivers/media/video/v4l2-compat-ioctl32.c as well! */ 1982 drivers/media/video/v4l2-compat-ioctl32.c as well! */