aboutsummaryrefslogtreecommitdiff
path: root/drivers/media/video/bttvp.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/bttvp.h')
-rw-r--r--drivers/media/video/bttvp.h6
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;