aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/saa7134/saa7134.h
diff options
context:
space:
mode:
authorRicardo Cerqueira <v4l@cerqueira.org>2005-11-09 00:37:56 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-09 10:56:22 -0500
commitac9cd97640a8bcad75dc7305761365c3e339bbc5 (patch)
treea5061e3804d7cc5debbd0277ba10fedbd3a3b2b0 /drivers/media/video/saa7134/saa7134.h
parentf4067fd46aa330d6df0a79b9dd0eb9555809c440 (diff)
[PATCH] v4l: 817: saa713x keymaps and key builders were moved from ir kbd i2c c
- SAA713x keymaps and key builders were moved from ir-kbd-i2c.c Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media/video/saa7134/saa7134.h')
-rw-r--r--drivers/media/video/saa7134/saa7134.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h
index d497fea5425f..99d000be095e 100644
--- a/drivers/media/video/saa7134/saa7134.h
+++ b/drivers/media/video/saa7134/saa7134.h
@@ -36,6 +36,7 @@
36#include <media/audiochip.h> 36#include <media/audiochip.h>
37#include <media/id.h> 37#include <media/id.h>
38#include <media/ir-common.h> 38#include <media/ir-common.h>
39#include <media/ir-kbd-i2c.h>
39#include <media/video-buf.h> 40#include <media/video-buf.h>
40#include <media/video-buf-dvb.h> 41#include <media/video-buf-dvb.h>
41 42
@@ -653,6 +654,10 @@ void saa7134_irq_oss_done(struct saa7134_dev *dev, unsigned long status);
653int saa7134_input_init1(struct saa7134_dev *dev); 654int saa7134_input_init1(struct saa7134_dev *dev);
654void saa7134_input_fini(struct saa7134_dev *dev); 655void saa7134_input_fini(struct saa7134_dev *dev);
655void saa7134_input_irq(struct saa7134_dev *dev); 656void saa7134_input_irq(struct saa7134_dev *dev);
657void saa7134_set_i2c_ir(struct saa7134_dev *dev, struct IR_i2c *ir);
658
659/* ----------------------------------------------------------- */
660/* saa7134-alsa.c */
656 661
657int alsa_card_saa7134_create(struct saa7134_dev *saadev, unsigned int devnum); 662int alsa_card_saa7134_create(struct saa7134_dev *saadev, unsigned int devnum);
658void alsa_card_saa7134_exit(void); 663void alsa_card_saa7134_exit(void);