summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/bttvp.h
diff options
context:
space:
mode:
Diffstat (limited to 'linux/drivers/media/video/bttvp.h')
-rw-r--r--linux/drivers/media/video/bttvp.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/linux/drivers/media/video/bttvp.h b/linux/drivers/media/video/bttvp.h
index 54c7830ba..91d3a15e7 100644
--- a/linux/drivers/media/video/bttvp.h
+++ b/linux/drivers/media/video/bttvp.h
@@ -1,5 +1,5 @@
/*
- $Id: bttvp.h,v 1.28 2005/12/07 11:18:39 mchehab Exp $
+ $Id: bttvp.h,v 1.29 2005/12/10 17:51:31 rmcc Exp $
bttv - Bt848 frame grabber driver
@@ -218,7 +218,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);
#endif
@@ -288,7 +287,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 */
@@ -313,7 +313,7 @@ struct bttv {
/* infrared remote */
int has_remote;
- struct bttv_input *remote;
+ struct bttv_ir *remote;
/* locking */
spinlock_t s_lock;