Fix private integer types used in V4L2 ioctls.
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
diff --git a/include/media/v4l2-common.h b/include/media/v4l2-common.h
index 642520a..daa2de1 100644
--- a/include/media/v4l2-common.h
+++ b/include/media/v4l2-common.h
@@ -82,19 +82,19 @@
/* VIDIOC_INT_G_REGISTER and VIDIOC_INT_S_REGISTER */
struct v4l2_register {
- u32 i2c_id; /* I2C driver ID of the I2C chip. 0 for the I2C adapter. */
+ __u32 i2c_id; /* I2C driver ID of the I2C chip. 0 for the I2C adapter. */
unsigned long reg;
- u32 val;
+ __u32 val;
};
/* VIDIOC_INT_DECODE_VBI_LINE */
struct v4l2_decode_vbi_line {
- u32 is_second_field; /* Set to 0 for the first (odd) field,
+ __u32 is_second_field; /* Set to 0 for the first (odd) field,
set to 1 for the second (even) field. */
- u8 *p; /* Pointer to the sliced VBI data from the decoder.
+ __u8 *p; /* Pointer to the sliced VBI data from the decoder.
On exit points to the start of the payload. */
- u32 line; /* Line number of the sliced VBI data (1-23) */
- u32 type; /* VBI service type (V4L2_SLICED_*). 0 if no service found */
+ __u32 line; /* Line number of the sliced VBI data (1-23) */
+ __u32 type; /* VBI service type (V4L2_SLICED_*). 0 if no service found */
};
/* VIDIOC_INT_G_CHIP_IDENT: identifies the actual chip installed on the board */
@@ -193,8 +193,8 @@
/* Routing definition, device dependent. It specifies which inputs (if any)
should be routed to which outputs (if any). */
struct v4l2_routing {
- u32 input;
- u32 output;
+ __u32 input;
+ __u32 output;
};
/* These internal commands should be used to define the inputs and outputs