[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>

authored by Michael Krufky and committed by Linus Torvalds 80d34362 239df2e2

+8 -19
+1 -1
Documentation/video4linux/CARDLIST.cx88
··· 26 26 card=25 - Digital-Logic MICROSPACE Entertainment Center (MEC) 27 27 card=26 - IODATA GV/BCTV7E 28 28 card=27 - PixelView PlayTV Ultra Pro (Stereo) 29 - card=28 - DViCO - FusionHDTV 3 Gold-Q 29 + card=28 - DViCO - FusionHDTV 3 Gold-T
+1 -1
Documentation/video4linux/CARDLIST.tuner
··· 58 58 tuner=57 - Philips FQ1236A MK4 59 59 tuner=58 - Ymec TVision TVF-8531MF 60 60 tuner=59 - Ymec TVision TVF-5533MF 61 - tuner=60 - Thomson DDT 7611 61 + tuner=60 - Thomson DDT 7611 (ATSC/NTSC)
+5 -16
drivers/media/video/cx88/cx88-cards.c
··· 428 428 .vmux = 2, 429 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] = { 439 - .name = "DViCO - FusionHDTV 3 Gold-Q", 440 - .tuner_type = 52, /* Thomson DDT 7610 ATSC/NTSC - Its actually a 7611 chip, but this works */ 432 + [CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_T] = { 433 + .name = "DViCO - FusionHDTV 3 Gold-T", 434 + .tuner_type = 52, /* Thomson DDT 7611 ATSC/NTSC */ 435 + /* See DViCO FusionHDTV 3 Gold for GPIO documentation. */ 441 436 .input = {{ 442 437 .type = CX88_VMUX_TELEVISION, 443 438 .vmux = 0, ··· 450 455 .vmux = 2, 451 456 .gpio0 = 0x0f00, 452 457 }}, 453 - #if 0 454 - .ts = { 455 - .type = CX88_TS, 456 - .gpio0 = 0x00000f01, /* Hooked to tuner reset bit */ 457 - } 458 - #endif 459 458 }, 460 459 [CX88_BOARD_HAUPPAUGE_DVB_T1] = { 461 460 .name = "Hauppauge Nova-T DVB-T", ··· 712 723 },{ 713 724 .subvendor = 0x18ac, 714 725 .subdevice = 0xd820, 715 - .card = CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_Q, 726 + .card = CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_T, 716 727 },{ 717 728 .subvendor = 0x18AC, 718 729 .subdevice = 0xDB00,
+1 -1
drivers/media/video/cx88/cx88.h
··· 163 163 #define CX88_BOARD_DIGITALLOGIC_MEC 25 164 164 #define CX88_BOARD_IODATA_GVBCTV7E 26 165 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 168 168 enum cx88_itype { 169 169 CX88_VMUX_COMPOSITE1 = 1,