diff options
Diffstat (limited to 'drivers/media/video/saa7134/saa7134.h')
-rw-r--r-- | drivers/media/video/saa7134/saa7134.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h index 28ec6804bd5d..66a390c321a7 100644 --- a/drivers/media/video/saa7134/saa7134.h +++ b/drivers/media/video/saa7134/saa7134.h | |||
@@ -333,6 +333,7 @@ struct saa7134_thread { | |||
333 | unsigned int scan1; | 333 | unsigned int scan1; |
334 | unsigned int scan2; | 334 | unsigned int scan2; |
335 | unsigned int mode; | 335 | unsigned int mode; |
336 | unsigned int stopped; | ||
336 | }; | 337 | }; |
337 | 338 | ||
338 | /* buffer for one video/vbi/ts frame */ | 339 | /* buffer for one video/vbi/ts frame */ |
@@ -524,7 +525,7 @@ struct saa7134_dev { | |||
524 | unsigned int hw_mute; | 525 | unsigned int hw_mute; |
525 | int last_carrier; | 526 | int last_carrier; |
526 | int nosignal; | 527 | int nosignal; |
527 | unsigned int inresume; | 528 | unsigned int insuspend; |
528 | 529 | ||
529 | /* SAA7134_MPEG_* */ | 530 | /* SAA7134_MPEG_* */ |
530 | struct saa7134_ts ts; | 531 | struct saa7134_ts ts; |
@@ -632,7 +633,7 @@ extern struct video_device saa7134_radio_template; | |||
632 | 633 | ||
633 | void set_tvnorm(struct saa7134_dev *dev, struct saa7134_tvnorm *norm); | 634 | void set_tvnorm(struct saa7134_dev *dev, struct saa7134_tvnorm *norm); |
634 | int saa7134_videoport_init(struct saa7134_dev *dev); | 635 | int saa7134_videoport_init(struct saa7134_dev *dev); |
635 | void saa7134_set_decoder(struct saa7134_dev *dev); | 636 | void saa7134_set_tvnorm_hw(struct saa7134_dev *dev); |
636 | 637 | ||
637 | int saa7134_common_ioctl(struct saa7134_dev *dev, | 638 | int saa7134_common_ioctl(struct saa7134_dev *dev, |
638 | unsigned int cmd, void *arg); | 639 | unsigned int cmd, void *arg); |
@@ -706,6 +707,8 @@ int saa7134_input_init1(struct saa7134_dev *dev); | |||
706 | void saa7134_input_fini(struct saa7134_dev *dev); | 707 | void saa7134_input_fini(struct saa7134_dev *dev); |
707 | void saa7134_input_irq(struct saa7134_dev *dev); | 708 | void saa7134_input_irq(struct saa7134_dev *dev); |
708 | void saa7134_set_i2c_ir(struct saa7134_dev *dev, struct IR_i2c *ir); | 709 | void saa7134_set_i2c_ir(struct saa7134_dev *dev, struct IR_i2c *ir); |
710 | void saa7134_ir_start(struct saa7134_dev *dev, struct card_ir *ir); | ||
711 | void saa7134_ir_stop(struct saa7134_dev *dev); | ||
709 | 712 | ||
710 | 713 | ||
711 | /* | 714 | /* |