3 files changed, 35 insertions, 0 deletions

diff --git a/Documentation/video4linux/CARDLIST.saa7134 b/Documentation/video4linux/CARDLIST.saa7134
index 9c8b1ca1ccc0..03512820f6c3 100644
--- a/Documentation/video4linux/CARDLIST.saa7134
+++ b/Documentation/video4linux/CARDLIST.saa7134
@@ -63,3 +63,4 @@
  62 -> Compro VideoMate TV Gold+II
  63 -> Kworld Xpert TV PVR7134
  64 -> FlyTV mini Asus Digimatrix               [1043:0210,1043:0210]
+ 65 -> V-Stream Studio TV Terminator
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index c277b3b46512..ea0237a0b563 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -2035,6 +2035,39 @@ struct saa7134_board saa7134_boards[] = {
                         .amux = LINE2,
                 },
         },
+        [SAA7134_BOARD_KWORLD_TERMINATOR] = {
+                /* Kworld V-Stream Studio TV Terminator */
+                /* "James Webb <jrwebb@qwest.net> */
+                .name           = "V-Stream Studio TV Terminator",
+                .audio_clock    = 0x00187de7,
+                .tuner_type     = TUNER_PHILIPS_TDA8290,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .gpiomask       = 1 << 21,
+                .inputs         = {{
+                        .name = name_tv,
+                        .vmux = 1,
+                        .amux = TV,
+                        .gpio = 0x0000000,
+                        .tv   = 1,
+                },{
+                        .name = name_comp1,     /* Composite input */
+                        .vmux = 3,
+                        .amux = LINE2,
+                        .gpio = 0x0000000,
+                },{
+                        .name = name_svideo,    /* S-Video input */
+                        .vmux = 8,
+                        .amux = LINE2,
+                        .gpio = 0x0000000,
+                }},
+                .radio = {
+                        .name = name_radio,
+                        .amux = TV,
+                        .gpio = 0x0200000,
+                },
+        },
 };
 
 
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h
index 7a7fa42e1d22..26ec9446dff5 100644
--- a/drivers/media/video/saa7134/saa7134.h
+++ b/drivers/media/video/saa7134/saa7134.h
@@ -185,6 +185,7 @@ struct saa7134_format {
 #define SAA7134_BOARD_VIDEOMATE_TV_GOLD_PLUSII 62
 #define SAA7134_BOARD_KWORLD_XPERT 63
 #define SAA7134_BOARD_FLYTV_DIGIMATRIX 64
+#define SAA7134_BOARD_KWORLD_TERMINATOR 65
 
 #define SAA7134_MAXBOARDS 8
 #define SAA7134_INPUT_MAX 8