diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-06-03 14:50:32 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-06-03 14:50:32 -0300 |
| commit | e92f78bc63e71d1572225b93b4ea0c31e6e6efc0 (patch) | |
| tree | bccc2c7dde50ddbe26b96fab474731c0af82f7c4 /linux/drivers/media/video/bt8xx/bttv-cards.c | |
| parent | b47d82cb176427c78627d8791cc1361be9c0e971 (diff) | |
| download | mediapointer-dvb-s2-e92f78bc63e71d1572225b93b4ea0c31e6e6efc0.tar.gz mediapointer-dvb-s2-e92f78bc63e71d1572225b93b4ea0c31e6e6efc0.tar.bz2 | |
backout changeset e30f9c367fabf6227e17c5191c62f886d55eb2d7
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Unfortunately, this patch were mixed with an experimental patch I'm working
with.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/bt8xx/bttv-cards.c')
| -rw-r--r-- | linux/drivers/media/video/bt8xx/bttv-cards.c | 27 |
1 files changed, 1 insertions, 26 deletions
diff --git a/linux/drivers/media/video/bt8xx/bttv-cards.c b/linux/drivers/media/video/bt8xx/bttv-cards.c index 6c8405ed0..177b75ebc 100644 --- a/linux/drivers/media/video/bt8xx/bttv-cards.c +++ b/linux/drivers/media/video/bt8xx/bttv-cards.c @@ -327,7 +327,7 @@ static struct CARD { { 0x00261822, BTTV_BOARD_TWINHAN_DST, "DNTV Live! Mini "}, { 0xd200dbc0, BTTV_BOARD_DVICO_FUSIONHDTV_2, "DViCO FusionHDTV 2" }, { 0x763c008a, BTTV_BOARD_GEOVISION_GV600, "GeoVision GV-600" }, - { 0x18011000, BTTV_BOARD_ENLTV_FM_2, "Encore ENL TV-FM-2" }, + { 0, -1, NULL } }; @@ -3087,31 +3087,6 @@ struct tvcard bttv_tvcards[] = { .has_radio = 1, .has_remote = 1, }, - [BTTV_BOARD_ENLTV_FM_2] = { - /* Encore TV Tuner Pro ENL TV-FM-2 - Mauro Carvalho Chehab <mchehab@infradead.org */ - .name = "Encore ENL TV-FM-2", - .video_inputs = 3, - .audio_inputs = 1, - .tuner = 0, - .svhs = 2, - /* bit 6 -> IR disabled - bit 18/17 = 00 -> mute - 01 -> enable external audio input - 10 -> internal audio input (mono?) - 11 -> internal audio input - */ - .gpiomask = 0x060040, - .muxsel = { 2, 3, 3 }, - .gpiomux = { 0x60000, 0x60000, 0x20000, 0x20000 }, - .gpiomute = 0, - .tuner_type = TUNER_TCL_MF02GIP_5N, - .tuner_addr = ADDR_UNSET, - .radio_addr = ADDR_UNSET, - .pll = PLL_28, - .has_radio = 1, - .has_remote = 1, - } }; static const unsigned int bttv_num_tvcards = ARRAY_SIZE(bttv_tvcards); |