From 16a273f4ec7f5c656bd5d7a6c1a5947382b1e4b4 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Tue, 18 Oct 2005 14:16:40 +0000 Subject: - SAA713x keymaps and key builders were moved from ir-kbd-i2c.c to saa7134-input.c - saa7134-i2c's attach now detects I2C IR and calls saa7134 specific code. - Small bugfix at ir-kbd-i2c. - disable_ir now unregisters i2c device. Signed-off-by: Ricardo Cerqueira Signed-off-by: Mauro Carvalho Chehab --- linux/drivers/media/video/saa7134/saa7134.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'linux/drivers/media/video/saa7134/saa7134.h') diff --git a/linux/drivers/media/video/saa7134/saa7134.h b/linux/drivers/media/video/saa7134/saa7134.h index 218263439..1b2dd403f 100644 --- a/linux/drivers/media/video/saa7134/saa7134.h +++ b/linux/drivers/media/video/saa7134/saa7134.h @@ -1,5 +1,5 @@ /* - * $Id: saa7134.h,v 1.69 2005/10/17 22:01:51 nsh Exp $ + * $Id: saa7134.h,v 1.70 2005/10/18 14:16:40 mchehab Exp $ * * v4l2 device driver for philips saa7134 based TV cards * @@ -38,6 +38,7 @@ #include #include #include +#include #include #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,64) #include @@ -664,6 +665,10 @@ void saa7134_irq_oss_done(struct saa7134_dev *dev, unsigned long status); int saa7134_input_init1(struct saa7134_dev *dev); void saa7134_input_fini(struct saa7134_dev *dev); void saa7134_input_irq(struct saa7134_dev *dev); +void saa7134_set_i2c_ir(struct saa7134_dev *dev, struct IR_i2c *ir); + +/* ----------------------------------------------------------- */ +/* saa7134-alsa.c */ int alsa_card_saa7134_create(struct saa7134_dev *saadev, unsigned int devnum); void alsa_card_saa7134_exit(void); -- cgit v1.2.3