3 files changed, 5 insertions, 1 deletions

diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index 89f32107f46b..4399d1371cc1 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -2543,11 +2543,12 @@ struct saa7134_board saa7134_boards[] = {
                 .name           = "Philips Tiger reference design",
                 .audio_clock    = 0x00187de7,
                 .tuner_type     = TUNER_PHILIPS_TDA8290,
+                .tuner_config   = 0,
                 .radio_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .mpeg           = SAA7134_MPEG_DVB,
-                .gpiomask       = 1 << 21,
+                .gpiomask       = 0x0200000,
                 .inputs = {{
                         .name   = name_tv,
                         .vmux   = 1,
diff --git a/drivers/media/video/saa7134/saa7134-i2c.c b/drivers/media/video/saa7134/saa7134-i2c.c
index cce8da6a4f94..62c107e7759d 100644
--- a/drivers/media/video/saa7134/saa7134-i2c.c
+++ b/drivers/media/video/saa7134/saa7134-i2c.c
@@ -370,6 +370,8 @@ static int attach_inform(struct i2c_client *client)
 
                 tun_setup.type = tuner;
                 tun_setup.addr = saa7134_boards[dev->board].tuner_addr;
+                tun_setup.config = saa7134_boards[dev->board].tuner_config;
+                tun_setup.gpio_func = (tuner_gpio_func_t) saa7134_set_gpio;
 
                 if ((tun_setup.addr == ADDR_UNSET)||(tun_setup.addr == client->addr)) {
 
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h
index 7b5ae194bb11..303c0806df91 100644
--- a/drivers/media/video/saa7134/saa7134.h
+++ b/drivers/media/video/saa7134/saa7134.h
@@ -280,6 +280,7 @@ struct saa7134_board {
         unsigned char           radio_addr;
 
         unsigned int            tda9887_conf;
+        unsigned int            tuner_config;
 
         /* peripheral I/O */
         enum saa7134_video_out  video_out;