1 files changed, 9 insertions, 4 deletions

diff --git a/drivers/media/video/bttvp.h b/drivers/media/video/bttvp.h
index 1e6a5632c3c7..dd00c20ab95e 100644
--- a/drivers/media/video/bttvp.h
+++ b/drivers/media/video/bttvp.h
@@ -73,6 +73,8 @@
 
 #define UNSET (-1U)
 
+#define clamp(x, low, high) min (max (low, x), high)
+
 /* ---------------------------------------------------------- */
 
 struct bttv_tvnorm {
@@ -88,6 +90,9 @@ struct bttv_tvnorm {
         u8    vbipack;
         u16   vtotal;
         int   sram;
+        /* ITU-R frame line number of the first VBI line we can
+           capture, of the first and second field. */
+        u16   vbistart[2];
 };
 extern const struct bttv_tvnorm bttv_tvnorms[];
 
@@ -209,7 +214,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);
 
 
 /* ---------------------------------------------------------- */
@@ -270,12 +274,13 @@ struct bttv {
         /* card configuration info */
         unsigned int cardid;   /* pci subsystem id (bt878 based ones) */
         unsigned int tuner_type;  /* tuner chip type */
-        unsigned int pinnacle_id;
+        unsigned int tda9887_conf;
         unsigned int svhs;
         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 +305,7 @@ struct bttv {
 
         /* infrared remote */
         int has_remote;
-        struct bttv_input *remote;
+        struct bttv_ir *remote;
 
         /* locking */
         spinlock_t s_lock;