aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/em28xx
diff options
context:
space:
mode:
authorCatimimi <catimimi@orange.fr>2010-02-18 16:06:32 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-02-26 13:11:02 -0500
commit656380118d1a1c0176e58e4e3e46d736d0dd2000 (patch)
tree2fa8cc6e5a2ed60c4731efa241b509b6da122215 /drivers/media/video/em28xx
parent7ccf1eea972177064b4df9d5ba68958604781db6 (diff)
V4L/DVB: em28xx : Terratec Cinergy Hybrid T USB XS FR is working
I succeeded in running Cinergy Hybrid T USB XS FR in both modes. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/em28xx')
-rw-r--r--drivers/media/video/em28xx/em28xx-cards.c3
-rw-r--r--drivers/media/video/em28xx/em28xx-dvb.c1
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index 77870a631efe..ecbcefb08739 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -745,11 +745,12 @@ struct em28xx_board em28xx_boards[] = {
745 745
746 [EM2880_BOARD_TERRATEC_HYBRID_XS_FR] = { 746 [EM2880_BOARD_TERRATEC_HYBRID_XS_FR] = {
747 .name = "Terratec Hybrid XS Secam", 747 .name = "Terratec Hybrid XS Secam",
748 .valid = EM28XX_BOARD_NOT_VALIDATED,
749 .has_msp34xx = 1, 748 .has_msp34xx = 1,
750 .tuner_type = TUNER_XC2028, 749 .tuner_type = TUNER_XC2028,
751 .tuner_gpio = default_tuner_gpio, 750 .tuner_gpio = default_tuner_gpio,
752 .decoder = EM28XX_TVP5150, 751 .decoder = EM28XX_TVP5150,
752 .has_dvb = 1,
753 .dvb_gpio = default_digital,
753 .input = { { 754 .input = { {
754 .type = EM28XX_VMUX_TELEVISION, 755 .type = EM28XX_VMUX_TELEVISION,
755 .vmux = TVP5150_COMPOSITE0, 756 .vmux = TVP5150_COMPOSITE0,
diff --git a/drivers/media/video/em28xx/em28xx-dvb.c b/drivers/media/video/em28xx/em28xx-dvb.c
index fcf8c10eac45..1b96356b3ab2 100644
--- a/drivers/media/video/em28xx/em28xx-dvb.c
+++ b/drivers/media/video/em28xx/em28xx-dvb.c
@@ -502,6 +502,7 @@ static int dvb_init(struct em28xx *dev)
502 } 502 }
503 break; 503 break;
504 case EM2880_BOARD_TERRATEC_HYBRID_XS: 504 case EM2880_BOARD_TERRATEC_HYBRID_XS:
505 case EM2880_BOARD_TERRATEC_HYBRID_XS_FR:
505 case EM2881_BOARD_PINNACLE_HYBRID_PRO: 506 case EM2881_BOARD_PINNACLE_HYBRID_PRO:
506 case EM2882_BOARD_DIKOM_DK300: 507 case EM2882_BOARD_DIKOM_DK300:
507 dvb->frontend = dvb_attach(zl10353_attach, 508 dvb->frontend = dvb_attach(zl10353_attach,