Commit c328d54c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb 

* git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (452 commits)
  V4L/DVB (7731): tuner-xc2028: fix signal strength calculus
  V4L/DVB (7730): tuner-xc2028: Fix SCODE load for MTS firmwares
  V4L/DVB (7729): Fix VIDIOCGAP corruption in ivtv
  V4L/DVB (7728): tea5761: bugzilla #10462: tea5761 autodetection code were broken
  V4L/DVB (7726): cx23885: Enable cx23417 support on the HVR1800
  V4L/DVB (7725): cx23885: Add generic cx23417 hardware encoder support
  V4L/DVB (7723): pvrusb2: Clean up input selection list generation in V4L interface
  V4L/DVB (7722): pvrusb2: Implement FM radio support for Gotview USB2.0 DVD 2
  V4L/DVB (7721): pvrusb2: Restructure cx23416 firmware loading to have a common exit point
  V4L/DVB (7720): pvrusb2: Fix bad error code on cx23416 firmware load failure
  V4L/DVB (7719): pvrusb2: Implement input selection enforcement
  V4L/DVB (7718): pvrusb2-dvb: update Kbuild selections
  V4L/DVB (7717): pvrusb2-dvb: add DVB-T support for Hauppauge pvrusb2 model 73xxx
  V4L/DVB (7716): pvrusb2: clean up global functions
  V4L/DVB (7715): pvrusb2: Clean out all use of __FUNCTION__
  V4L/DVB (7714): pvrusb2: Fix hang on module removal
  V4L/DVB (7713): pvrusb2: Implement cleaner DVB kernel thread shutdown
  V4L/DVB (7712): pvrusb2: Close connect/disconnect race
  V4L/DVB (7711): pvrusb2: Fix race on module unload
  V4L/DVB (7710): pvrusb2: Implement critical digital streaming quirk for onair devices
  ...
parents 346ad4b7 b0166ab3

Documentation/video4linux/CARDLIST.au0828

0 → 100644
+4 −0
Original line number Diff line number Diff line 
  0 -> Unknown board                            (au0828)

  1 -> Hauppauge HVR950Q                        (au0828)        [2040:7200]

  2 -> Hauppauge HVR850                         (au0828)        [2040:7240]

  3 -> DViCO FusionHDTV USB                     (au0828)        [0fe9:d620]

Documentation/video4linux/CARDLIST.bttv

+2 −0
Original line number Diff line number Diff line
@@ -148,3 +148,5 @@ 
147 -> VoodooTV 200 (USA)                                  [121a:3000]

148 -> DViCO FusionHDTV 2                                  [dbc0:d200]

149 -> Typhoon TV-Tuner PCI (50684)

150 -> Geovision GV-600                                    [008a:763c]

151 -> Kozumi KTV-01C

Documentation/video4linux/CARDLIST.cx23885

+3 −0
Original line number Diff line number Diff line
@@ -5,3 +5,6 @@ 
  4 -> DViCO FusionHDTV5 Express                           [18ac:d500]

  5 -> Hauppauge WinTV-HVR1500Q                            [0070:7790,0070:7797]

  6 -> Hauppauge WinTV-HVR1500                             [0070:7710,0070:7717]

  7 -> Hauppauge WinTV-HVR1200                             [0070:71d1]

  8 -> Hauppauge WinTV-HVR1700                             [0070:8101]

  9 -> Hauppauge WinTV-HVR1400                             [0070:8010]

Documentation/video4linux/CARDLIST.cx88

+9 −0
Original line number Diff line number Diff line
@@ -57,3 +57,12 @@ 
 56 -> Hauppauge WinTV-HVR1300 DVB-T/Hybrid MPEG Encoder   [0070:9600,0070:9601,0070:9602]

 57 -> ADS Tech Instant Video PCI                          [1421:0390]

 58 -> Pinnacle PCTV HD 800i                               [11bd:0051]

 59 -> DViCO FusionHDTV 5 PCI nano                         [18ac:d530]

 60 -> Pinnacle Hybrid PCTV                                [12ab:1788]

 61 -> Winfast TV2000 XP Global                            [107d:6f18]

 62 -> PowerColor Real Angel 330                           [14f1:ea3d]

 63 -> Geniatech X8000-MT DVBT                             [14f1:8852]

 64 -> DViCO FusionHDTV DVB-T PRO                          [18ac:db30]

 65 -> DViCO FusionHDTV 7 Gold                             [18ac:d610]

 66 -> Prolink Pixelview MPEG 8000GT                       [1554:4935]

 67 -> Kworld PlusTV HD PCI 120 (ATSC 120)                 [17de:08c1]

Documentation/video4linux/CARDLIST.saa7134

+11 −2
Original line number Diff line number Diff line
@@ -25,8 +25,8 @@ 
 24 -> KNC One TV-Station DVR                   [1894:a006]

 25 -> ASUS TV-FM 7133                          [1043:4843]

 26 -> Pinnacle PCTV Stereo (saa7134)           [11bd:002b]

 27 -> Manli MuchTV M-TV002/Behold TV 403 FM

 28 -> Manli MuchTV M-TV001/Behold TV 401

 27 -> Manli MuchTV M-TV002

 28 -> Manli MuchTV M-TV001

 29 -> Nagase Sangyo TransGear 3000TV           [1461:050c]

 30 -> Elitegroup ECS TVP3XP FM1216 Tuner Card(PAL-BG,FM)  [1019:4cb4]

 31 -> Elitegroup ECS TVP3XP FM1236 Tuner Card (NTSC,FM) [1019:4cb5]
@@ -131,3 +131,12 @@ 
130 -> Beholder BeholdTV M6 / BeholdTV M6 Extra [5ace:6190,5ace:6193]

131 -> Twinhan Hybrid DTV-DVB 3056 PCI          [1822:0022]

132 -> Genius TVGO AM11MCE

133 -> NXP Snake DVB-S reference design

134 -> Medion/Creatix CTX953 Hybrid             [16be:0010]

135 -> MSI TV@nywhere A/D v1.1                  [1462:8625]

136 -> AVerMedia Cardbus TV/Radio (E506R)       [1461:f436]

137 -> AVerMedia Hybrid TV/Radio (A16D)         [1461:f936]

138 -> Avermedia M115                           [1461:a836]

139 -> Compro VideoMate T750                    [185b:c900]

140 -> Avermedia DVB-S Pro A700                 [1461:a7a1]

141 -> Avermedia DVB-S Hybrid+FM A700           [1461:a7a2]

CRA Git | Maintained and supported by SUSTech CRA and CCSE