3 files changed, 19 insertions, 5 deletions

diff --git a/Documentation/video4linux/CARDLIST.bttv b/Documentation/video4linux/CARDLIST.bttv
index 581f666a76cf..407ab4660dce 100644
--- a/Documentation/video4linux/CARDLIST.bttv
+++ b/Documentation/video4linux/CARDLIST.bttv
@@ -160,3 +160,4 @@
 159 -> ProVideo PV183                                      [1830:1540,1831:1540,1832:1540,1833:1540,1834:1540,1835:1540,1836:1540,1837:1540]
 160 -> Tongwei Video Technology TD-3116                    [f200:3116]
 161 -> Aposonic W-DVR                                      [0279:0228]
+162 -> Adlink MPG24
diff --git a/drivers/media/pci/bt8xx/bttv-cards.c b/drivers/media/pci/bt8xx/bttv-cards.c
index b7dc921e1b91..8d327ff60e37 100644
--- a/drivers/media/pci/bt8xx/bttv-cards.c
+++ b/drivers/media/pci/bt8xx/bttv-cards.c
@@ -2705,7 +2705,7 @@ struct tvcard bttv_tvcards[] = {
                 .has_radio      = 1,
                 .has_remote     = 1,
         },
-                [BTTV_BOARD_VD012] = {
+        [BTTV_BOARD_VD012] = {
                 /* D.Heer@Phytec.de */
                 .name           = "PHYTEC VD-012 (bt878)",
                 .video_inputs   = 4,
@@ -2718,7 +2718,7 @@ struct tvcard bttv_tvcards[] = {
                 .tuner_type     = TUNER_ABSENT,
                 .tuner_addr     = ADDR_UNSET,
         },
-                [BTTV_BOARD_VD012_X1] = {
+        [BTTV_BOARD_VD012_X1] = {
                 /* D.Heer@Phytec.de */
                 .name           = "PHYTEC VD-012-X1 (bt878)",
                 .video_inputs   = 4,
@@ -2731,7 +2731,7 @@ struct tvcard bttv_tvcards[] = {
                 .tuner_type     = TUNER_ABSENT,
                 .tuner_addr     = ADDR_UNSET,
         },
-                [BTTV_BOARD_VD012_X2] = {
+        [BTTV_BOARD_VD012_X2] = {
                 /* D.Heer@Phytec.de */
                 .name           = "PHYTEC VD-012-X2 (bt878)",
                 .video_inputs   = 4,
@@ -2744,7 +2744,7 @@ struct tvcard bttv_tvcards[] = {
                 .tuner_type     = TUNER_ABSENT,
                 .tuner_addr     = ADDR_UNSET,
         },
-                [BTTV_BOARD_GEOVISION_GV800S] = {
+        [BTTV_BOARD_GEOVISION_GV800S] = {
                 /* Bruno Christo <bchristo@inf.ufsm.br>
                  *
                  * GeoVision GV-800(S) has 4 Conexant Fusion 878A:
@@ -2771,7 +2771,7 @@ struct tvcard bttv_tvcards[] = {
                 .no_tda7432     = 1,
                 .muxsel_hook    = gv800s_muxsel,
         },
-                [BTTV_BOARD_GEOVISION_GV800S_SL] = {
+        [BTTV_BOARD_GEOVISION_GV800S_SL] = {
                 /* Bruno Christo <bchristo@inf.ufsm.br>
                  *
                  * GeoVision GV-800(S) has 4 Conexant Fusion 878A:
@@ -2808,6 +2808,7 @@ struct tvcard bttv_tvcards[] = {
                 .tuner_type     = TUNER_ABSENT,
                 .tuner_addr     = ADDR_UNSET,
         },
+        /* ---- card 0xa0---------------------------------- */
         [BTTV_BOARD_TVT_TD3116] = {
                 .name           = "Tongwei Video Technology TD-3116",
                 .video_inputs   = 16,
@@ -2825,6 +2826,17 @@ struct tvcard bttv_tvcards[] = {
                 .muxsel         = MUXSEL(2, 3, 1, 0),
                 .tuner_type     = TUNER_ABSENT,
         },
+        [BTTV_BOARD_ADLINK_MPG24] = {
+                /* Adlink MPG24 */
+                .name           = "Adlink MPG24",
+                .video_inputs   = 1,
+                /* .audio_inputs= 1, */
+                .svhs           = NO_SVHS,
+                .muxsel         = MUXSEL(2, 2, 2, 2),
+                .tuner_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .pll            = PLL_28,
+        },
 
 };
 
diff --git a/drivers/media/pci/bt8xx/bttv.h b/drivers/media/pci/bt8xx/bttv.h
index 6139ce26dc2c..f01c9d4c7ec1 100644
--- a/drivers/media/pci/bt8xx/bttv.h
+++ b/drivers/media/pci/bt8xx/bttv.h
@@ -185,6 +185,7 @@
 #define BTTV_BOARD_PV183                   0x9f
 #define BTTV_BOARD_TVT_TD3116              0xa0
 #define BTTV_BOARD_APOSONIC_WDVR           0xa1
+#define BTTV_BOARD_ADLINK_MPG24            0xa2
 
 /* more card-specific defines */
 #define PT2254_L_CHANNEL 0x10