aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/bttv.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/bttv.h')
-rw-r--r--drivers/media/video/bttv.h20
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/media/video/bttv.h b/drivers/media/video/bttv.h
index 26cd117a6df4..124ea41dada4 100644
--- a/drivers/media/video/bttv.h
+++ b/drivers/media/video/bttv.h
@@ -202,7 +202,7 @@ struct bttv_core {
202 struct list_head subs; /* struct bttv_sub_device */ 202 struct list_head subs; /* struct bttv_sub_device */
203 203
204 /* device config */ 204 /* device config */
205 unsigned int nr; /* dev nr (for printk("bttv%d: ..."); */ 205 unsigned int nr; /* dev nr (for printk("bttv%d: ..."); */
206 unsigned int type; /* card type (pointer into tvcards[]) */ 206 unsigned int type; /* card type (pointer into tvcards[]) */
207 char name[8]; /* dev name */ 207 char name[8]; /* dev name */
208}; 208};
@@ -211,16 +211,16 @@ struct bttv;
211 211
212struct tvcard 212struct tvcard
213{ 213{
214 char *name; 214 char *name;
215 unsigned int video_inputs; 215 unsigned int video_inputs;
216 unsigned int audio_inputs; 216 unsigned int audio_inputs;
217 unsigned int tuner; 217 unsigned int tuner;
218 unsigned int svhs; 218 unsigned int svhs;
219 unsigned int digital_mode; // DIGITAL_MODE_CAMERA or DIGITAL_MODE_VIDEO 219 unsigned int digital_mode; // DIGITAL_MODE_CAMERA or DIGITAL_MODE_VIDEO
220 u32 gpiomask; 220 u32 gpiomask;
221 u32 muxsel[16]; 221 u32 muxsel[16];
222 u32 audiomux[6]; /* Tuner, Radio, external, internal, mute, stereo */ 222 u32 audiomux[6]; /* Tuner, Radio, external, internal, mute, stereo */
223 u32 gpiomask2; /* GPIO MUX mask */ 223 u32 gpiomask2; /* GPIO MUX mask */
224 224
225 /* i2c audio flags */ 225 /* i2c audio flags */
226 unsigned int no_msp34xx:1; 226 unsigned int no_msp34xx:1;