aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/saa7134/saa7134.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/saa7134/saa7134.h')
-rw-r--r--drivers/media/video/saa7134/saa7134.h17
1 files changed, 2 insertions, 15 deletions
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h
index 88cd1297df13..73b16b2044f6 100644
--- a/drivers/media/video/saa7134/saa7134.h
+++ b/drivers/media/video/saa7134/saa7134.h
@@ -411,20 +411,6 @@ struct saa7134_dmasound {
411 struct snd_pcm_substream *substream; 411 struct snd_pcm_substream *substream;
412}; 412};
413 413
414/* IR input */
415struct saa7134_ir {
416 struct input_dev *dev;
417 struct ir_input_state ir;
418 char name[32];
419 char phys[32];
420 u32 mask_keycode;
421 u32 mask_keydown;
422 u32 mask_keyup;
423 int polling;
424 u32 last_gpio;
425 struct timer_list timer;
426};
427
428/* ts/mpeg status */ 414/* ts/mpeg status */
429struct saa7134_ts { 415struct saa7134_ts {
430 /* TS capture */ 416 /* TS capture */
@@ -463,7 +449,7 @@ struct saa7134_dev {
463 449
464 /* infrared remote */ 450 /* infrared remote */
465 int has_remote; 451 int has_remote;
466 struct saa7134_ir *remote; 452 struct card_ir *remote;
467 453
468 /* pci i/o */ 454 /* pci i/o */
469 char name[32]; 455 char name[32];
@@ -698,6 +684,7 @@ void saa7134_input_fini(struct saa7134_dev *dev);
698void saa7134_input_irq(struct saa7134_dev *dev); 684void saa7134_input_irq(struct saa7134_dev *dev);
699void saa7134_set_i2c_ir(struct saa7134_dev *dev, struct IR_i2c *ir); 685void saa7134_set_i2c_ir(struct saa7134_dev *dev, struct IR_i2c *ir);
700 686
687
701/* 688/*
702 * Local variables: 689 * Local variables:
703 * c-basic-offset: 8 690 * c-basic-offset: 8