diff options
| author | Ricardo Cerqueira <v4l@cerqueira.org> | 2006-01-09 15:25:25 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@brturbo.com.br> | 2006-01-09 15:25:25 -0200 |
| commit | 4abdfed5676e5ef7f2461bb76f5929068a9cc9cf (patch) | |
| tree | ff4e3e80f57f788a9cf450966f137c44b58ff1b2 /drivers/media/video/bttvp.h | |
| parent | e0b2d7a89bb250fb0c9068c4481c9fd26c3fb227 (diff) | |
V4L/DVB (3161): ir-kbd-gpio is now part of bttv
- Merged ir-kbd-gpio into bttv as bttv-input, for consistency with other
input modules
Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Diffstat (limited to 'drivers/media/video/bttvp.h')
| -rw-r--r-- | drivers/media/video/bttvp.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/bttvp.h b/drivers/media/video/bttvp.h index d04d0238534..55759f698e0 100644 --- a/drivers/media/video/bttvp.h +++ b/drivers/media/video/bttvp.h @@ -209,7 +209,6 @@ extern struct bus_type bttv_sub_bus_type; int bttv_sub_add_device(struct bttv_core *core, char *name); int bttv_sub_del_devices(struct bttv_core *core); void bttv_gpio_irq(struct bttv_core *core); -int bttv_any_irq(struct bttv_core *core); /* ---------------------------------------------------------- */ @@ -275,7 +274,8 @@ struct bttv { struct bttv_pll_info pll; int triton1; int gpioirq; - int any_irq; + int (*custom_irq)(struct bttv *btv); + int use_i2c_hw; /* old gpio interface */ @@ -300,7 +300,7 @@ struct bttv { /* infrared remote */ int has_remote; - struct bttv_input *remote; + struct bttv_ir *remote; /* locking */ spinlock_t s_lock; |