aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@m1k.net>2005-06-24 01:04:55 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-24 03:06:38 -0400
commit80d34362f391840dcb10c0ec261f765871a586f7 (patch)
tree0a269ba05f0a72f044fd714096ec852d57f49a16 /drivers/media
parent239df2e2b0e1f4f69fdf76fb67e865824029e8ab (diff)
[PATCH] DViCO FusionHDTV3 Gold-T documentation fix
Even though it says DViCO FusionHDTV3 Gold-Q on the box, Gold-T is printed on the card. This fix corrects the error in all places, and corrects the tuner name Thomson DDT 7611 (ATSC/NTSC) in the documentation. This applies against 2.6.12-rc5-mm2 after applying Manueal Capinha's patch "Add support for PixelView Ultra Pro in v4l" (because of the change from card=27 to card=28) Signed-off-by: Michael Krufky <mkrufky@m1k.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/cx88/cx88-cards.c21
-rw-r--r--drivers/media/video/cx88/cx88.h2
2 files changed, 6 insertions, 17 deletions
diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c
index 1c036cc36fe1..c3a561e38e54 100644
--- a/drivers/media/video/cx88/cx88-cards.c
+++ b/drivers/media/video/cx88/cx88-cards.c
@@ -428,16 +428,11 @@ struct cx88_board cx88_boards[] = {
428 .vmux = 2, 428 .vmux = 2,
429 .gpio0 = 0x0f00, 429 .gpio0 = 0x0f00,
430 }}, 430 }},
431#if 0
432 .ts = {
433 .type = CX88_TS,
434 .gpio0 = 0x00000f01, /* Hooked to tuner reset bit */
435 }
436#endif
437 }, 431 },
438 [CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_Q] = { 432 [CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_T] = {
439 .name = "DViCO - FusionHDTV 3 Gold-Q", 433 .name = "DViCO - FusionHDTV 3 Gold-T",
440 .tuner_type = 52, /* Thomson DDT 7610 ATSC/NTSC - Its actually a 7611 chip, but this works */ 434 .tuner_type = 52, /* Thomson DDT 7611 ATSC/NTSC */
435 /* See DViCO FusionHDTV 3 Gold for GPIO documentation. */
441 .input = {{ 436 .input = {{
442 .type = CX88_VMUX_TELEVISION, 437 .type = CX88_VMUX_TELEVISION,
443 .vmux = 0, 438 .vmux = 0,
@@ -455,12 +450,6 @@ struct cx88_board cx88_boards[] = {
455 .vmux = 2, 450 .vmux = 2,
456 .gpio0 = 0x0f00, 451 .gpio0 = 0x0f00,
457 }}, 452 }},
458#if 0
459 .ts = {
460 .type = CX88_TS,
461 .gpio0 = 0x00000f01, /* Hooked to tuner reset bit */
462 }
463#endif
464 }, 453 },
465 [CX88_BOARD_HAUPPAUGE_DVB_T1] = { 454 [CX88_BOARD_HAUPPAUGE_DVB_T1] = {
466 .name = "Hauppauge Nova-T DVB-T", 455 .name = "Hauppauge Nova-T DVB-T",
@@ -723,7 +712,7 @@ struct cx88_subid cx88_subids[] = {
723 },{ 712 },{
724 .subvendor = 0x18ac, 713 .subvendor = 0x18ac,
725 .subdevice = 0xd820, 714 .subdevice = 0xd820,
726 .card = CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_Q, 715 .card = CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_T,
727 },{ 716 },{
728 .subvendor = 0x18AC, 717 .subvendor = 0x18AC,
729 .subdevice = 0xDB00, 718 .subdevice = 0xDB00,
diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h
index 7fca1f500c56..80ddf9911e2f 100644
--- a/drivers/media/video/cx88/cx88.h
+++ b/drivers/media/video/cx88/cx88.h
@@ -163,7 +163,7 @@ extern struct sram_channel cx88_sram_channels[];
163#define CX88_BOARD_DIGITALLOGIC_MEC 25 163#define CX88_BOARD_DIGITALLOGIC_MEC 25
164#define CX88_BOARD_IODATA_GVBCTV7E 26 164#define CX88_BOARD_IODATA_GVBCTV7E 26
165#define CX88_BOARD_PIXELVIEW_PLAYTV_ULTRA_PRO 27 165#define CX88_BOARD_PIXELVIEW_PLAYTV_ULTRA_PRO 27
166#define CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_Q 28 166#define CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_T 28
167 167
168enum cx88_itype { 168enum cx88_itype {
169 CX88_VMUX_COMPOSITE1 = 1, 169 CX88_VMUX_COMPOSITE1 = 1,