diff options
| author | Nickolay V. Shmyrev <devnull@localhost> | 2005-11-08 18:02:29 +0000 |
|---|---|---|
| committer | Nickolay V. Shmyrev <devnull@localhost> | 2005-11-08 18:02:29 +0000 |
| commit | 89be1826553ca76b848f05289820f8d02b3426cd (patch) | |
| tree | 10688c353af96f6c3be40fd1034f545cc802fd2d /linux/drivers/media/video/bttv-driver.c | |
| parent | b2b2469453ba9130911ad68c19de057386d7e281 (diff) | |
| download | mediapointer-dvb-s2-89be1826553ca76b848f05289820f8d02b3426cd.tar.gz mediapointer-dvb-s2-89be1826553ca76b848f05289820f8d02b3426cd.tar.bz2 | |
* ../linux/drivers/media/video/bttv-cards.c: (bttv_init_card2):
* ../linux/drivers/media/video/bttv-driver.c: (bttv_irq):
* ../linux/drivers/media/video/bttv-gpio.c: (bttv_any_irq):
* ../linux/drivers/media/video/bttv.h:
* ../linux/drivers/media/video/bttvp.h:
* ../linux/drivers/media/video/ir-kbd-gpio.c: (rc5_decode),
(ir_rc5_irq), (ir_rc5_timer_end), (ir_rc5_timer_keyup), (ir_probe),
(ir_remove):
Support for Nebula rc5-based gpio remote.
Signed-off-by: Mark Weaver <mark-clist@npsl.co.uk>
Diffstat (limited to 'linux/drivers/media/video/bttv-driver.c')
| -rw-r--r-- | linux/drivers/media/video/bttv-driver.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/linux/drivers/media/video/bttv-driver.c b/linux/drivers/media/video/bttv-driver.c index 32c87422b..f32144b36 100644 --- a/linux/drivers/media/video/bttv-driver.c +++ b/linux/drivers/media/video/bttv-driver.c @@ -1,5 +1,5 @@ /* - $Id: bttv-driver.c,v 1.65 2005/11/06 17:01:47 mchehab Exp $ + $Id: bttv-driver.c,v 1.66 2005/11/08 18:02:29 nsh Exp $ bttv - Bt848 frame grabber driver @@ -3695,6 +3695,12 @@ static irqreturn_t bttv_irq(int irq, void *dev_id, struct pt_regs * regs) int handled = 0; btv=(struct bttv *)dev_id; + +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) + if (btv->any_irq) + handled = bttv_any_irq(&btv->c); +#endif + count=0; while (1) { /* get/clear interrupt status bits */ |