1 files changed, 14 insertions, 10 deletions

diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index 622d3ba5a1ec..4f32486a10d6 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -3260,6 +3260,7 @@ struct saa7134_board saa7134_boards[] = {
         },
         [SAA7134_BOARD_HAUPPAUGE_HVR1110] = {
                 /* Thomas Genty <tomlohave@gmail.com> */
+                /* David Bentham <db260179@hotmail.com> */
                 .name           = "Hauppauge WinTV-HVR1110 DVB-T/Hybrid",
                 .audio_clock    = 0x00187de7,
                 .tuner_type     = TUNER_PHILIPS_TDA8290,
@@ -3268,23 +3269,26 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_addr     = ADDR_UNSET,
                 .tuner_config   = 1,
                 .mpeg           = SAA7134_MPEG_DVB,
+                .gpiomask       = 0x0200100,
                 .inputs         = {{
                         .name = name_tv,
                         .vmux = 1,
                         .amux = TV,
                         .tv   = 1,
-                },{
-                        .name   = name_comp1,
-                        .vmux   = 3,
-                        .amux   = LINE2, /* FIXME: audio doesn't work on svideo/composite */
-                },{
-                        .name   = name_svideo,
-                        .vmux   = 8,
-                        .amux   = LINE2, /* FIXME: audio doesn't work on svideo/composite */
-                }},
+                        .gpio = 0x0000100,
+                }, {
+                        .name = name_comp1,
+                        .vmux = 3,
+                        .amux = LINE1,
+                }, {
+                        .name = name_svideo,
+                        .vmux = 8,
+                        .amux = LINE1,
+                } },
                 .radio = {
                         .name = name_radio,
-                        .amux   = TV,
+                        .amux = TV,
+                        .gpio = 0x0200100,
                 },
         },
         [SAA7134_BOARD_CINERGY_HT_PCMCIA] = {