Merge tag 'firmware-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[~andy/linux] / include / media / v4l2-ioctl.h

diff --git a/include/media/v4l2-ioctl.h b/include/media/v4l2-ioctl.h
index b273f0e81818c6d24110954cb2303ab37667f486..931652f0e2af9e20a7d79053cbd718e8aeceaddc 100644 (file)
--- a/include/media/v4l2-ioctl.h
+++ b/include/media/v4l2-ioctl.h
@@ -243,13 +243,13 @@ struct v4l2_ioctl_ops {
                                        struct v4l2_dbg_register *reg);
        int (*vidioc_s_register)       (struct file *file, void *fh,
                                        const struct v4l2_dbg_register *reg);
+
+       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);
 
-       int (*vidioc_g_chip_name)      (struct file *file, void *fh,
-                                       struct v4l2_dbg_chip_name *chip);
-
        int (*vidioc_enum_framesizes)   (struct file *file, void *fh,
                                         struct v4l2_frmsizeenum *fsize);