From 571e13e907446f56a3c28b927ba8746702dc5dbc Mon Sep 17 00:00:00 2001 From: Catimimi Date: Thu, 18 Feb 2010 18:06:32 -0300 Subject: [PATCH] --- yaml --- r: 181707 b: refs/heads/master c: 656380118d1a1c0176e58e4e3e46d736d0dd2000 h: refs/heads/master i: 181705: 6de914c051e6e6fb2f7c009d8c1c584f5afe6f5f 181703: a325016c7bbd9dad332c5832eaa365b226c7d7d7 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/em28xx/em28xx-cards.c | 3 ++- trunk/drivers/media/video/em28xx/em28xx-dvb.c | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 5f3c1f097bd9..3f2e3d3875e3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7ccf1eea972177064b4df9d5ba68958604781db6 +refs/heads/master: 656380118d1a1c0176e58e4e3e46d736d0dd2000 diff --git a/trunk/drivers/media/video/em28xx/em28xx-cards.c b/trunk/drivers/media/video/em28xx/em28xx-cards.c index 77870a631efe..ecbcefb08739 100644 --- a/trunk/drivers/media/video/em28xx/em28xx-cards.c +++ b/trunk/drivers/media/video/em28xx/em28xx-cards.c @@ -745,11 +745,12 @@ struct em28xx_board em28xx_boards[] = { [EM2880_BOARD_TERRATEC_HYBRID_XS_FR] = { .name = "Terratec Hybrid XS Secam", - .valid = EM28XX_BOARD_NOT_VALIDATED, .has_msp34xx = 1, .tuner_type = TUNER_XC2028, .tuner_gpio = default_tuner_gpio, .decoder = EM28XX_TVP5150, + .has_dvb = 1, + .dvb_gpio = default_digital, .input = { { .type = EM28XX_VMUX_TELEVISION, .vmux = TVP5150_COMPOSITE0, diff --git a/trunk/drivers/media/video/em28xx/em28xx-dvb.c b/trunk/drivers/media/video/em28xx/em28xx-dvb.c index fcf8c10eac45..1b96356b3ab2 100644 --- a/trunk/drivers/media/video/em28xx/em28xx-dvb.c +++ b/trunk/drivers/media/video/em28xx/em28xx-dvb.c @@ -502,6 +502,7 @@ static int dvb_init(struct em28xx *dev) } break; case EM2880_BOARD_TERRATEC_HYBRID_XS: + case EM2880_BOARD_TERRATEC_HYBRID_XS_FR: case EM2881_BOARD_PINNACLE_HYBRID_PRO: case EM2882_BOARD_DIKOM_DK300: dvb->frontend = dvb_attach(zl10353_attach,