diff options
| author | Ricardo Cerqueira <devnull@localhost> | 2005-11-05 02:49:20 +0000 |
|---|---|---|
| committer | Ricardo Cerqueira <devnull@localhost> | 2005-11-05 02:49:20 +0000 |
| commit | 01bae253fab811e0e8938576d483a7773a97a7d1 (patch) | |
| tree | 8a2cc6e193880f075193a00c29924f40f50715d1 /linux/drivers/media/video/saa7134/saa7134-core.c | |
| parent | a94efc083924c335223beb5d03860b06714b0c98 (diff) | |
| download | mediapointer-dvb-s2-01bae253fab811e0e8938576d483a7773a97a7d1.tar.gz mediapointer-dvb-s2-01bae253fab811e0e8938576d483a7773a97a7d1.tar.bz2 | |
- SAA713x cards with i2c remotes now autoload ir-kbd-i2c
(disable_ir works, as it does for GPIO remotes)
Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org>
Diffstat (limited to 'linux/drivers/media/video/saa7134/saa7134-core.c')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-core.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-core.c b/linux/drivers/media/video/saa7134/saa7134-core.c index b61799153..c5664af9e 100644 --- a/linux/drivers/media/video/saa7134/saa7134-core.c +++ b/linux/drivers/media/video/saa7134/saa7134-core.c @@ -1,5 +1,5 @@ /* - * $Id: saa7134-core.c,v 1.46 2005/10/16 12:13:58 mchehab Exp $ + * $Id: saa7134-core.c,v 1.47 2005/11/05 02:49:20 rmcc Exp $ * * device driver for philips saa7134 based TV cards * driver core @@ -782,10 +782,12 @@ static int saa7134_hwinit2(struct saa7134_dev *dev) SAA7134_IRQ2_INTE_PE | SAA7134_IRQ2_INTE_AR; - if (dev->has_remote) + if (dev->has_remote == SAA7134_REMOTE_GPIO) irq2_mask |= (SAA7134_IRQ2_INTE_GPIO18 | SAA7134_IRQ2_INTE_GPIO18A | SAA7134_IRQ2_INTE_GPIO16 ); + else if (dev->has_remote == SAA7134_REMOTE_I2C) + request_module("ir-kbd-i2c"); saa_writel(SAA7134_IRQ1, 0); saa_writel(SAA7134_IRQ2, irq2_mask); |