summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Krufky <devnull@localhost>2006-01-12 00:52:28 +0000
committerMichael Krufky <devnull@localhost>2006-01-12 00:52:28 +0000
commit03468f0b2614f7e5d30b44785f262fbc563f6f3a (patch)
tree2aa611fc7d75dd82c781502f6de6399edf7f4d7f
parent665b8c6f4708781640d1d250563abfd104a1a5ee (diff)
downloadmediapointer-dvb-s2-03468f0b2614f7e5d30b44785f262fbc563f6f3a.tar.gz
mediapointer-dvb-s2-03468f0b2614f7e5d30b44785f262fbc563f6f3a.tar.bz2
Add PCI ID for UltraView DVB-T Plus, rebranded DViCO FusionHDTV DVB-T Plus
- Add PCI ID for UltraView DVB-T Plus, rebranded DViCO FusionHDTV DVB-T Plus Signed-off-by: Michael Krufky <mkrufky@m1k.net>
-rw-r--r--linux/Documentation/video4linux/CARDLIST.cx882
-rw-r--r--linux/drivers/media/video/cx88/cx88-cards.c7
-rw-r--r--v4l/ChangeLog9
3 files changed, 16 insertions, 2 deletions
diff --git a/linux/Documentation/video4linux/CARDLIST.cx88 b/linux/Documentation/video4linux/CARDLIST.cx88
index 34b6e59f2..56e194f1a 100644
--- a/linux/Documentation/video4linux/CARDLIST.cx88
+++ b/linux/Documentation/video4linux/CARDLIST.cx88
@@ -19,7 +19,7 @@
18 -> Hauppauge Nova-T DVB-T [0070:9002,0070:9001]
19 -> Conexant DVB-T reference design [14f1:0187]
20 -> Provideo PV259 [1540:2580]
- 21 -> DViCO FusionHDTV DVB-T Plus [18ac:db10]
+ 21 -> DViCO FusionHDTV DVB-T Plus [18ac:db10,18ac:db11]
22 -> pcHDTV HD3000 HDTV [7063:3000]
23 -> digitalnow DNTV Live! DVB-T [17de:a8a6]
24 -> Hauppauge WinTV 28xxx (Roslyn) models [0070:2801]
diff --git a/linux/drivers/media/video/cx88/cx88-cards.c b/linux/drivers/media/video/cx88/cx88-cards.c
index 2173d4866..e3c07dd34 100644
--- a/linux/drivers/media/video/cx88/cx88-cards.c
+++ b/linux/drivers/media/video/cx88/cx88-cards.c
@@ -1,5 +1,5 @@
/*
- * $Id: cx88-cards.c,v 1.118 2006/01/09 01:05:19 pascoe Exp $
+ * $Id: cx88-cards.c,v 1.119 2006/01/12 00:52:28 mkrufky Exp $
*
* device driver for Conexant 2388x based TV cards
* card-specific stuff.
@@ -1246,6 +1246,11 @@ struct cx88_subid cx88_subids[] = {
.subvendor = 0x18ac,
.subdevice = 0xdb50,
.card = CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL,
+ },{
+ .subvendor = 0x18ac,
+ .subdevice = 0xdb11,
+ .card = CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PLUS,
+ /* Re-branded DViCO: UltraView DVB-T Plus */
},
};
const unsigned int cx88_idcount = ARRAY_SIZE(cx88_subids);
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index eaeef92a2..4b68b6aef 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,12 @@
+2006-01-12 00:49 mkrufky
+
+ * linux/Documentation/video4linux/CARDLIST.cx88:
+ * linux/drivers/media/video/cx88/cx88-cards.c:
+ - Add PCI ID for UltraView DVB-T Plus,
+ rebranded DViCO FusionHDTV DVB-T Plus
+
+ Signed-off-by: Michael Krufky <mkrufky@m1k.net>
+
2006-01-12 00:11 mchehab
* linux/drivers/media/video/cx25840/cx25840-core.c: (set_input),