summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--linux/drivers/media/video/cx88/cx88-cards.c6
-rw-r--r--v4l/ChangeLog7
2 files changed, 11 insertions, 2 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-cards.c b/linux/drivers/media/video/cx88/cx88-cards.c
index 76e8d61fe..f9b3e71d6 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.69 2005/05/29 10:37:17 nsh Exp $
+ * $Id: cx88-cards.c,v 1.70 2005/05/30 15:34:52 mchehab Exp $
*
* device driver for Conexant 2388x based TV cards
* card-specific stuff.
@@ -756,6 +756,10 @@ struct cx88_subid cx88_subids[] = {
.subvendor = 0x10fc,
.subdevice = 0xd035,
.card = CX88_BOARD_IODATA_GVBCTV7E,
+ },{
+ .subvendor = 0x14f1,
+ .subdevice = 0x8800,
+ .card = CX88_BOARD_PIXELVIEW_PLAYTV_ULTRA_PRO,
}
};
const unsigned int cx88_idcount = ARRAY_SIZE(cx88_subids);
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 698eb093f..91d36b215 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-30 16:33 mchehab
+ * cx88-cards,c:
+
+ - Included PCI ID 14f1:8800 to CX88_BOARD_PIXELVIEW_PLAYTV_ULTRA_PRO
+
2005-05-30 02:42 mchehab
* tuner-core.c, tuner-simple.c, tuner.h:
@@ -1077,7 +1082,7 @@
saa7134-reg.h, saa7134-ts.c, saa7134-tvaudio.c, saa7134-vbi.c,
saa7134-video.c, saa7134.h, video-buf.c, video-buf.h:
- - added a bunch of $Id: ChangeLog,v 1.10 2005/05/30 02:02:47 mchehab Exp $ tags.
+ - added a bunch of $Id: ChangeLog,v 1.11 2005/05/30 15:34:52 mchehab Exp $ tags.
2004-09-15 17:35 kraxel