diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-05-27 15:53:00 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-05-27 15:53:00 -0300 |
| commit | 2ba29f04ef6c89b77c469257ed249a94c52b8871 (patch) | |
| tree | 3e539f588e3266b11d5f949cd7891c81a7407372 /linux/drivers/media/video/saa7134/saa7134-cards.c | |
| parent | 5f623f9662748ffe9662ee5b0561fe746ef3279d (diff) | |
| parent | 9c9fd460173573929daf32f42a502283a9aaae26 (diff) | |
| download | mediapointer-dvb-s2-2ba29f04ef6c89b77c469257ed249a94c52b8871.tar.gz mediapointer-dvb-s2-2ba29f04ef6c89b77c469257ed249a94c52b8871.tar.bz2 | |
merge: http://kernellabs.com/hg/~dheitmueller/dvb-frontend-exit-fix
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/saa7134/saa7134-cards.c')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-cards.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-cards.c b/linux/drivers/media/video/saa7134/saa7134-cards.c index a4e3deac2..587209fdd 100644 --- a/linux/drivers/media/video/saa7134/saa7134-cards.c +++ b/linux/drivers/media/video/saa7134/saa7134-cards.c @@ -3403,13 +3403,15 @@ struct saa7134_board saa7134_boards[] = { }, }, [SAA7134_BOARD_HAUPPAUGE_HVR1110R3] = { - .name = "Hauppauge WinTV-HVR1110r3", + .name = "Hauppauge WinTV-HVR1110r3 DVB-T/Hybrid", .audio_clock = 0x00187de7, .tuner_type = TUNER_PHILIPS_TDA8290, .radio_type = UNSET, .tuner_addr = ADDR_UNSET, .radio_addr = ADDR_UNSET, .tuner_config = 3, + .mpeg = SAA7134_MPEG_DVB, + .ts_type = SAA7134_MPEG_TS_SERIAL, .gpiomask = 0x0800100, /* GPIO 21 is an INPUT */ .inputs = {{ .name = name_tv, |