diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-15 04:51:40 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-15 04:51:40 -0500 |
| commit | f055408957750cf759162c364c2a4dfe19765844 (patch) | |
| tree | aecc0a13c582d310902e6fa95d8853c627828fcc /drivers/media/video/bttvp.h | |
| parent | 83cbd33aae2c3cd14f80a8abf733033a57aa4923 (diff) | |
| parent | 4060994c3e337b40e0f6fa8ce2cc178e021baf3d (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/media/video/bttvp.h')
| -rw-r--r-- | drivers/media/video/bttvp.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/video/bttvp.h b/drivers/media/video/bttvp.h index 386f546f7d1..3aa9c6e4fc3 100644 --- a/drivers/media/video/bttvp.h +++ b/drivers/media/video/bttvp.h @@ -208,6 +208,7 @@ 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); /* ---------------------------------------------------------- */ @@ -273,6 +274,7 @@ struct bttv { struct bttv_pll_info pll; int triton1; int gpioirq; + int any_irq; int use_i2c_hw; /* old gpio interface */ |