diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-06-11 18:17:50 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-06-11 18:17:50 -0300 |
commit | fd4694cdbe15f591792ec5166c3d9791c4b1e34f (patch) | |
tree | 99866153be11055c726828017b089a40e7f8daa1 /linux/drivers/media/video/saa7134/saa7134-cards.c | |
parent | 4b038fe7fa0a646fedf0e49aa2bfba38c814e3ad (diff) | |
parent | aaaaa6a00dd372109ceb39c63aef9088ec86e344 (diff) | |
download | mediapointer-dvb-s2-fd4694cdbe15f591792ec5166c3d9791c4b1e34f.tar.gz mediapointer-dvb-s2-fd4694cdbe15f591792ec5166c3d9791c4b1e34f.tar.bz2 |
merge: http://linuxtv.org/hg/~awalls/v4l-dvb
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 | 2 |
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 */ |