1 files changed, 8 insertions, 6 deletions

diff --git a/drivers/media/pci/bt8xx/bttvp.h b/drivers/media/pci/bt8xx/bttvp.h
index e6e2c60f9e3e..bc048c586b1f 100644
--- a/drivers/media/pci/bt8xx/bttvp.h
+++ b/drivers/media/pci/bt8xx/bttvp.h
@@ -42,6 +42,7 @@
 #include <media/tveeprom.h>
 #include <media/rc-core.h>
 #include <media/ir-kbd-i2c.h>
+#include <media/tea575x.h>
 
 #include "bt848.h"
 #include "bttv.h"
@@ -359,6 +360,10 @@ struct bttv_suspend_state {
         struct bttv_buffer     *vbi;
 };
 
+struct bttv_tea575x_gpio {
+        u8 data, clk, wren, most;
+};
+
 struct bttv {
         struct bttv_core c;
 
@@ -445,12 +450,9 @@ struct bttv {
 
         /* miro/pinnacle + Aimslab VHX
            philips matchbox (tea5757 radio tuner) support */
-        int has_matchbox;
-        int mbox_we;
-        int mbox_data;
-        int mbox_clk;
-        int mbox_most;
-        int mbox_mask;
+        int has_tea575x;
+        struct bttv_tea575x_gpio tea_gpio;
+        struct snd_tea575x tea;
 
         /* ISA stuff (Terratec Active Radio Upgrade) */
         int mbox_ior;