diff options
Diffstat (limited to 'drivers/media/video/bt8xx/bttvp.h')
-rw-r--r-- | drivers/media/video/bt8xx/bttvp.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/media/video/bt8xx/bttvp.h b/drivers/media/video/bt8xx/bttvp.h index 199a4d225caf..230e148e78fe 100644 --- a/drivers/media/video/bt8xx/bttvp.h +++ b/drivers/media/video/bt8xx/bttvp.h | |||
@@ -135,7 +135,7 @@ struct bttv_buffer { | |||
135 | 135 | ||
136 | /* bttv specific */ | 136 | /* bttv specific */ |
137 | const struct bttv_format *fmt; | 137 | const struct bttv_format *fmt; |
138 | int tvnorm; | 138 | unsigned int tvnorm; |
139 | int btformat; | 139 | int btformat; |
140 | int btswap; | 140 | int btswap; |
141 | struct bttv_geometry geo; | 141 | struct bttv_geometry geo; |
@@ -154,7 +154,7 @@ struct bttv_buffer_set { | |||
154 | }; | 154 | }; |
155 | 155 | ||
156 | struct bttv_overlay { | 156 | struct bttv_overlay { |
157 | int tvnorm; | 157 | unsigned int tvnorm; |
158 | struct v4l2_rect w; | 158 | struct v4l2_rect w; |
159 | enum v4l2_field field; | 159 | enum v4l2_field field; |
160 | struct v4l2_clip *clips; | 160 | struct v4l2_clip *clips; |
@@ -174,7 +174,7 @@ struct bttv_vbi_fmt { | |||
174 | }; | 174 | }; |
175 | 175 | ||
176 | /* bttv-vbi.c */ | 176 | /* bttv-vbi.c */ |
177 | void bttv_vbi_fmt_reset(struct bttv_vbi_fmt *f, int norm); | 177 | void bttv_vbi_fmt_reset(struct bttv_vbi_fmt *f, unsigned int norm); |
178 | 178 | ||
179 | struct bttv_crop { | 179 | struct bttv_crop { |
180 | /* A cropping rectangle in struct bttv_tvnorm.cropcap units. */ | 180 | /* A cropping rectangle in struct bttv_tvnorm.cropcap units. */ |
@@ -378,7 +378,8 @@ struct bttv { | |||
378 | unsigned int audio; | 378 | unsigned int audio; |
379 | unsigned int mute; | 379 | unsigned int mute; |
380 | unsigned long freq; | 380 | unsigned long freq; |
381 | int tvnorm,hue,contrast,bright,saturation; | 381 | unsigned int tvnorm; |
382 | int hue, contrast, bright, saturation; | ||
382 | struct v4l2_framebuffer fbuf; | 383 | struct v4l2_framebuffer fbuf; |
383 | unsigned int field_count; | 384 | unsigned int field_count; |
384 | 385 | ||