summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--linux/Documentation/video4linux/CARDLIST.cx882
-rw-r--r--linux/drivers/media/video/cx88/cx88-cards.c6
-rw-r--r--v4l/ChangeLog9
3 files changed, 15 insertions, 2 deletions
diff --git a/linux/Documentation/video4linux/CARDLIST.cx88 b/linux/Documentation/video4linux/CARDLIST.cx88
index fa88056db..bb93a0a18 100644
--- a/linux/Documentation/video4linux/CARDLIST.cx88
+++ b/linux/Documentation/video4linux/CARDLIST.cx88
@@ -16,7 +16,7 @@
15 -> DViCO FusionHDTV DVB-T1 [18ac:db00]
16 -> KWorld LTV883RF
17 -> DViCO FusionHDTV 3 Gold-Q [18ac:d810]
- 18 -> Hauppauge Nova-T DVB-T [0070:9002]
+ 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]
diff --git a/linux/drivers/media/video/cx88/cx88-cards.c b/linux/drivers/media/video/cx88/cx88-cards.c
index 8bd21eb08..67f697c80 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.111 2005/12/02 04:16:47 mkrufky Exp $
+ * $Id: cx88-cards.c,v 1.112 2005/12/02 04:38:14 mkrufky Exp $
*
* device driver for Conexant 2388x based TV cards
* card-specific stuff.
@@ -1163,6 +1163,10 @@ struct cx88_subid cx88_subids[] = {
.subvendor = 0x0070,
.subdevice = 0x9802,
.card = CX88_BOARD_HAUPPAUGE_HVR1100LP,
+ },{
+ .subvendor = 0x0070,
+ .subdevice = 0x9001,
+ .card = CX88_BOARD_HAUPPAUGE_DVB_T1,
},
};
const unsigned int cx88_idcount = ARRAY_SIZE(cx88_subids);
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index cfa4a54c8..96b8a052a 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,12 @@
+2005-12-02 04:37 mkrufky
+
+ * ../linux/Documentation/video4linux/CARDLIST.cx88:
+ * ../linux/drivers/media/video/cx88/cx88-cards.c:
+ - Add support for another Nova-T-PCI PCI subdevice 0x9001
+
+ Signed-off-by: Steven Toth <stoth@hauppauge.com>
+ Signed-off-by: Michael Krufky <mkrufky@m1k.net>
+
2005-12-02 04:22 mkrufky
* ../linux/drivers/media/video/cx88/cx88-i2c.c: