summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/saa7134/saa7134-cards.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-06-11 18:40:00 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-06-11 18:40:00 -0300
commit91b24eda72df7f1320bf3b064515c96039bfca0d (patch)
tree99e8ea8f19c28758417d4c3398523595359d48c7 /linux/drivers/media/video/saa7134/saa7134-cards.c
parent2fca1e165c0f13087c2eaed3d0e4a4c4fbb24fe5 (diff)
parentfd4694cdbe15f591792ec5166c3d9791c4b1e34f (diff)
downloadmediapointer-dvb-s2-91b24eda72df7f1320bf3b064515c96039bfca0d.tar.gz
mediapointer-dvb-s2-91b24eda72df7f1320bf3b064515c96039bfca0d.tar.bz2
merge: http://linuxtv.org/hg/~dougsland/video4linux
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.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-cards.c b/linux/drivers/media/video/saa7134/saa7134-cards.c
index 587209fdd..064fb86bc 100644
--- a/linux/drivers/media/video/saa7134/saa7134-cards.c
+++ b/linux/drivers/media/video/saa7134/saa7134-cards.c
@@ -4497,6 +4497,7 @@ struct saa7134_board saa7134_boards[] = {
/* Igor Kuznetsov <igk@igk.ru> */
/* Andrey Melnikoff <temnota@kmv.ru> */
/* Beholder Intl. Ltd. Dmitry Belimov <d.belimov@gmail.com> */
+ /* Alexey Osipov <lion-simba@pridelands.ru> */
.name = "Beholder BeholdTV M6",
.audio_clock = 0x00187de7,
.tuner_type = TUNER_PHILIPS_FM1216ME_MK3,
@@ -4571,6 +4572,7 @@ struct saa7134_board saa7134_boards[] = {
/* Igor Kuznetsov <igk@igk.ru> */
/* Andrey Melnikoff <temnota@kmv.ru> */
/* Beholder Intl. Ltd. Dmitry Belimov <d.belimov@gmail.com> */
+ /* Alexey Osipov <lion-simba@pridelands.ru> */
.name = "Beholder BeholdTV M6 Extra",
.audio_clock = 0x00187de7,
.tuner_type = TUNER_PHILIPS_FM1216ME_MK3, /* FIXME to MK5 */