diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-03-17 17:19:42 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-03-17 17:19:42 -0200 |
| commit | 01d687a75155f9c9181e46572a60c71040d9133d (patch) | |
| tree | 23a5939cfc6b1f24d0730c5c70a3d43c96063d6e /linux/drivers/media/video/cx88 | |
| parent | 806e8a78b6b2b8bbab30dafd89ada8402e9564ed (diff) | |
| parent | 13f01356dce8354c14e7e1a3f25162a24a002fff (diff) | |
| download | mediapointer-dvb-s2-01d687a75155f9c9181e46572a60c71040d9133d.tar.gz mediapointer-dvb-s2-01d687a75155f9c9181e46572a60c71040d9133d.tar.bz2 | |
merge: http://linuxtv.org/hg/~endriss/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/cx88')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-cards.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-cards.c b/linux/drivers/media/video/cx88/cx88-cards.c index 3a7131342..774bcfed9 100644 --- a/linux/drivers/media/video/cx88/cx88-cards.c +++ b/linux/drivers/media/video/cx88/cx88-cards.c @@ -1570,10 +1570,10 @@ struct cx88_subid cx88_subids[] = { },{ .subvendor = 0x17de, .subdevice = 0x0840, - .card = CX88_BOARD_KWORLD_HARDWARE_MPEG_TV_XPERT, - },{ - .subvendor = 0x1421, - .subdevice = 0x0305, + .card = CX88_BOARD_KWORLD_HARDWARE_MPEG_TV_XPERT, + },{ + .subvendor = 0x1421, + .subdevice = 0x0305, .card = CX88_BOARD_KWORLD_HARDWARE_MPEG_TV_XPERT, },{ .subvendor = 0x18ac, @@ -1664,6 +1664,10 @@ struct cx88_subid cx88_subids[] = { .subvendor = 0x0070, .subdevice = 0x1402, .card = CX88_BOARD_HAUPPAUGE_HVR3000, + },{ + .subvendor = 0x1421, + .subdevice = 0x0341, /* ADS Tech InstantTV DVB-S */ + .card = CX88_BOARD_KWORLD_DVBS_100, }, }; const unsigned int cx88_idcount = ARRAY_SIZE(cx88_subids); |