diff options
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-cards.c | 6 | ||||
| -rw-r--r-- | v4l/ChangeLog | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-cards.c b/linux/drivers/media/video/cx88/cx88-cards.c index 3394c3515..2b78402cb 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.71 2005/05/30 15:43:44 mchehab Exp $ + * $Id: cx88-cards.c,v 1.72 2005/06/01 19:24:57 mchehab Exp $ * * device driver for Conexant 2388x based TV cards * card-specific stuff. @@ -757,10 +757,6 @@ 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 2a3a6ce4b..df319679e 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,8 @@ +2005-06-01 20:21 mchehab + * cx88-cards.c: + + - PV Ultra Pro PCI ID was wrong. Removed. + 2005-06-01 19:54 nsh * scripts/hwdata.pl: @@ -1102,7 +1107,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.15 2005/06/01 15:58:53 nsh Exp $ tags. + - added a bunch of $Id: ChangeLog,v 1.16 2005/06/01 19:24:57 mchehab Exp $ tags. 2004-09-15 17:35 kraxel |