diff options
-rw-r--r-- | include/media/v4l2-common.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/include/media/v4l2-common.h b/include/media/v4l2-common.h index daa2de1784f1..642520acdfa7 100644 --- a/include/media/v4l2-common.h +++ b/include/media/v4l2-common.h | |||
@@ -82,19 +82,19 @@ extern void v4l_printk_ioctl_arg(char *s,unsigned int cmd, void *arg); | |||
82 | 82 | ||
83 | /* VIDIOC_INT_G_REGISTER and VIDIOC_INT_S_REGISTER */ | 83 | /* VIDIOC_INT_G_REGISTER and VIDIOC_INT_S_REGISTER */ |
84 | struct v4l2_register { | 84 | struct v4l2_register { |
85 | __u32 i2c_id; /* I2C driver ID of the I2C chip. 0 for the I2C adapter. */ | 85 | u32 i2c_id; /* I2C driver ID of the I2C chip. 0 for the I2C adapter. */ |
86 | unsigned long reg; | 86 | unsigned long reg; |
87 | __u32 val; | 87 | u32 val; |
88 | }; | 88 | }; |
89 | 89 | ||
90 | /* VIDIOC_INT_DECODE_VBI_LINE */ | 90 | /* VIDIOC_INT_DECODE_VBI_LINE */ |
91 | struct v4l2_decode_vbi_line { | 91 | struct v4l2_decode_vbi_line { |
92 | __u32 is_second_field; /* Set to 0 for the first (odd) field, | 92 | u32 is_second_field; /* Set to 0 for the first (odd) field, |
93 | set to 1 for the second (even) field. */ | 93 | set to 1 for the second (even) field. */ |
94 | __u8 *p; /* Pointer to the sliced VBI data from the decoder. | 94 | u8 *p; /* Pointer to the sliced VBI data from the decoder. |
95 | On exit points to the start of the payload. */ | 95 | On exit points to the start of the payload. */ |
96 | __u32 line; /* Line number of the sliced VBI data (1-23) */ | 96 | u32 line; /* Line number of the sliced VBI data (1-23) */ |
97 | __u32 type; /* VBI service type (V4L2_SLICED_*). 0 if no service found */ | 97 | u32 type; /* VBI service type (V4L2_SLICED_*). 0 if no service found */ |
98 | }; | 98 | }; |
99 | 99 | ||
100 | /* VIDIOC_INT_G_CHIP_IDENT: identifies the actual chip installed on the board */ | 100 | /* VIDIOC_INT_G_CHIP_IDENT: identifies the actual chip installed on the board */ |
@@ -193,8 +193,8 @@ enum v4l2_chip_ident { | |||
193 | /* Routing definition, device dependent. It specifies which inputs (if any) | 193 | /* Routing definition, device dependent. It specifies which inputs (if any) |
194 | should be routed to which outputs (if any). */ | 194 | should be routed to which outputs (if any). */ |
195 | struct v4l2_routing { | 195 | struct v4l2_routing { |
196 | __u32 input; | 196 | u32 input; |
197 | __u32 output; | 197 | u32 output; |
198 | }; | 198 | }; |
199 | 199 | ||
200 | /* These internal commands should be used to define the inputs and outputs | 200 | /* These internal commands should be used to define the inputs and outputs |