diff options
| author | Mauro Carvalho Chehab <devnull@localhost> | 2005-06-03 18:00:42 +0000 |
|---|---|---|
| committer | Mauro Carvalho Chehab <devnull@localhost> | 2005-06-03 18:00:42 +0000 |
| commit | 3ea938d322d9b7ac6090dc80d9b83a5e39e5b342 (patch) | |
| tree | 80317128eb84a90e1673a4e589f6cf56e12ba3d9 | |
| parent | 66e2bd1c3d76fb052149faabf07b56d641947e9c (diff) | |
| download | mediapointer-dvb-s2-3ea938d322d9b7ac6090dc80d9b83a5e39e5b342.tar.gz mediapointer-dvb-s2-3ea938d322d9b7ac6090dc80d9b83a5e39e5b342.tar.bz2 | |
* cx88-cards.c:
- PV Ultra Pro PCI ID was included by accident. Removed.
* tuner-simple.c:
- Ymec chipset now reflects Philips, instead of Temic.
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-cards.c | 6 | ||||
| -rw-r--r-- | linux/drivers/media/video/tuner-simple.c | 6 | ||||
| -rw-r--r-- | v4l/ChangeLog | 10 |
3 files changed, 13 insertions, 9 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-cards.c b/linux/drivers/media/video/cx88/cx88-cards.c index 4e2370620..4ecb24d16 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.74 2005/06/03 13:31:50 mchehab Exp $ + * $Id: cx88-cards.c,v 1.75 2005/06/03 18:00:42 mchehab Exp $ * * device driver for Conexant 2388x based TV cards * card-specific stuff. @@ -756,10 +756,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/linux/drivers/media/video/tuner-simple.c b/linux/drivers/media/video/tuner-simple.c index 453a0889f..d5760d104 100644 --- a/linux/drivers/media/video/tuner-simple.c +++ b/linux/drivers/media/video/tuner-simple.c @@ -1,5 +1,5 @@ /* - * $Id: tuner-simple.c,v 1.15 2005/06/03 11:39:35 mchehab Exp $ + * $Id: tuner-simple.c,v 1.16 2005/06/03 18:00:42 mchehab Exp $ * * i2c tv tuner chip device driver * controls all those simple 4-control-bytes style tuners. @@ -214,9 +214,9 @@ static struct tunertype tuners[] = { 16*160.00,16*442.00,0x01,0x02,0x04,0x8e,732 }, /* Should work for TVF8531MF, TVF8831MF, TVF8731MF */ - { "Ymec TVision TVF-8531MF", TEMIC, NTSC, + { "Ymec TVision TVF-8531MF", Philips, NTSC, 16*160.00,16*454.00,0xa0,0x90,0x30,0x8e,732}, - { "Ymec TVision TVF-5533MF", TEMIC, NTSC, + { "Ymec TVision TVF-5533MF", Philips, NTSC, 16*160.00,16*454.00,0x01,0x02,0x04,0x8e,732}, { "Thomson DDT 7611 (ATSC/NTSC)", THOMSON, ATSC, 16*157.25,16*454.00,0x39,0x3a,0x3c,0x8e,732}, diff --git a/v4l/ChangeLog b/v4l/ChangeLog index b10ed771b..69c529184 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,4 +1,12 @@ +2005-06-03 18:56 mchehab + * cx88-cards.c: + - PV Ultra Pro PCI ID was included by accident. Removed. + + * tuner-simple.c: + - Ymec chipset now reflects Philips, instead of Temic. + 2005-06-03 14:26 mchehab + * cx88-cards.c: - changed tuner number by it's name as defined on tuner.h. @@ -1146,7 +1154,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.18 2005/06/03 13:31:50 mchehab Exp $ tags. + - added a bunch of $Id: ChangeLog,v 1.19 2005/06/03 18:00:42 mchehab Exp $ tags. 2004-09-15 17:35 kraxel |