Commit 0dd51986 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (425 commits)
  V4L/DVB (11870): gspca - main: VIDIOC_ENUM_FRAMESIZES ioctl added.
  V4L/DVB (12004): poll method lose race condition
  V4L/DVB (11894): flexcop-pci: dmesg visible names broken
  V4L/DVB (11892): Siano: smsendian - declare function as extern
  V4L/DVB (11891): Siano: smscore - bind the GPIO SMS protocol
  V4L/DVB (11890): Siano: smscore - remove redundant code
  V4L/DVB (11889): Siano: smsdvb - add DVB v3 events
  V4L/DVB (11888): Siano: smsusb - remove redundant ifdef
  V4L/DVB (11887): Siano: smscards - add board (target) events
  V4L/DVB (11886): Siano: smscore - fix some new GPIO definitions names
  V4L/DVB (11885): Siano: Add new GPIO management interface
  V4L/DVB (11884): Siano: smssdio - revert to stand alone module
  V4L/DVB (11883): Siano: cards - add two additional (USB) devices
  V4L/DVB (11824): Siano: smsusb - change exit func debug msg
  V4L/DVB (11823): Siano: smsusb - fix typo in module description
  V4L/DVB (11822): Siano: smscore - bug fix at get_device_mode
  V4L/DVB (11821): Siano: smscore - fix isdb-t firmware name
  V4L/DVB (11820): Siano: smscore - fix byte ordering bug
  V4L/DVB (11819): Siano: smscore - fix get_common_buffer bug
  V4L/DVB (11818): Siano: smscards - assign gpio to HPG targets
  ...
parents c868d550 11c635a2

Documentation/dvb/get_dvb_firmware

+4 −4
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ sub tda10045 { 


sub tda10046 {

	my $sourcefile = "TT_PCI_2.19h_28_11_2006.zip";

	my $url = "http://technotrend-online.com/download/software/219/$sourcefile";

	my $url = "http://www.tt-download.com/download/updates/219/$sourcefile";

	my $hash = "6a7e1e2f2644b162ff0502367553c72d";

	my $outfile = "dvb-fe-tda10046.fw";

	my $tmpdir = tempdir(DIR => "/tmp", CLEANUP => 1);
@@ -129,8 +129,8 @@ sub tda10046 { 
}



sub tda10046lifeview {

    my $sourcefile = "Drv_2.11.02.zip";

    my $url = "http://www.lifeview.com.tw/drivers/pci_card/FlyDVB-T/$sourcefile";

    my $sourcefile = "7%5Cdrv_2.11.02.zip";

    my $url = "http://www.lifeview.hk/dbimages/document/$sourcefile";

    my $hash = "1ea24dee4eea8fe971686981f34fd2e0";

    my $outfile = "dvb-fe-tda10046.fw";

    my $tmpdir = tempdir(DIR => "/tmp", CLEANUP => 1);
@@ -317,7 +317,7 @@ sub nxt2002 { 


sub nxt2004 {

    my $sourcefile = "AVerTVHD_MCE_A180_Drv_v1.2.2.16.zip";

    my $url = "http://www.aver.com/support/Drivers/$sourcefile";

    my $url = "http://www.avermedia-usa.com/support/Drivers/$sourcefile";

    my $hash = "111cb885b1e009188346d72acfed024c";

    my $outfile = "dvb-fe-nxt2004.fw";

    my $tmpdir = tempdir(DIR => "/tmp", CLEANUP => 1);

Documentation/video4linux/CARDLIST.cx23885

+5 −0
Original line number Diff line number Diff line
@@ -16,3 +16,8 @@ 
 15 -> TeVii S470                                          [d470:9022]

 16 -> DVBWorld DVB-S2 2005                                [0001:2005]

 17 -> NetUP Dual DVB-S2 CI                                [1b55:2a2c]

 18 -> Hauppauge WinTV-HVR1270                             [0070:2211]

 19 -> Hauppauge WinTV-HVR1275                             [0070:2215]

 20 -> Hauppauge WinTV-HVR1255                             [0070:2251]

 21 -> Hauppauge WinTV-HVR1210                             [0070:2291,0070:2295]

 22 -> Mygica X8506 DMB-TH                                 [14f1:8651]

Documentation/video4linux/CARDLIST.cx88

+2 −0
Original line number Diff line number Diff line
@@ -78,3 +78,5 @@ 
 77 -> TBS 8910 DVB-S                                      [8910:8888]

 78 -> Prof 6200 DVB-S                                     [b022:3022]

 79 -> Terratec Cinergy HT PCI MKII                        [153b:1177]

 80 -> Hauppauge WinTV-IR Only                             [0070:9290]

 81 -> Leadtek WinFast DTV1800 Hybrid                      [107d:6654]

Documentation/video4linux/CARDLIST.em28xx

+5 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
 16 -> Hauppauge WinTV HVR 950                  (em2883)        [2040:6513,2040:6517,2040:651b]

 17 -> Pinnacle PCTV HD Pro Stick               (em2880)        [2304:0227]

 18 -> Hauppauge WinTV HVR 900 (R2)             (em2880)        [2040:6502]

 19 -> PointNix Intra-Oral Camera               (em2860)

 19 -> EM2860/SAA711X Reference Design          (em2860)

 20 -> AMD ATI TV Wonder HD 600                 (em2880)        [0438:b002]

 21 -> eMPIA Technology, Inc. GrabBeeX+ Video Encoder (em2800)        [eb1a:2801]

 22 -> Unknown EM2750/EM2751 webcam grabber     (em2750)        [eb1a:2750,eb1a:2751]
@@ -61,3 +61,7 @@ 
 63 -> Kaiomy TVnPC U2                          (em2860)        [eb1a:e303]

 64 -> Easy Cap Capture DC-60                   (em2860)

 65 -> IO-DATA GV-MVP/SZ                        (em2820/em2840) [04bb:0515]

 66 -> Empire dual TV                           (em2880)

 67 -> Terratec Grabby                          (em2860)        [0ccd:0096]

 68 -> Terratec AV350                           (em2860)        [0ccd:0084]

 69 -> KWorld ATSC 315U HDTV TV Box             (em2882)        [eb1a:a313]

Documentation/video4linux/CARDLIST.saa7134

+17 −5
Original line number Diff line number Diff line
@@ -124,10 +124,10 @@ 
123 -> Beholder BeholdTV 407                    [0000:4070]

124 -> Beholder BeholdTV 407 FM                 [0000:4071]

125 -> Beholder BeholdTV 409                    [0000:4090]

126 -> Beholder BeholdTV 505 FM/RDS             [0000:5051,0000:505B,5ace:5050]

127 -> Beholder BeholdTV 507 FM/RDS / BeholdTV 509 FM [0000:5071,0000:507B,5ace:5070,5ace:5090]

126 -> Beholder BeholdTV 505 FM                 [5ace:5050]

127 -> Beholder BeholdTV 507 FM / BeholdTV 509 FM [5ace:5070,5ace:5090]

128 -> Beholder BeholdTV Columbus TVFM          [0000:5201]

129 -> Beholder BeholdTV 607 / BeholdTV 609     [5ace:6070,5ace:6071,5ace:6072,5ace:6073,5ace:6090,5ace:6091,5ace:6092,5ace:6093]

129 -> Beholder BeholdTV 607 FM                 [5ace:6070]

130 -> Beholder BeholdTV M6                     [5ace:6190]

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

132 -> Genius TVGO AM11MCE
@@ -143,7 +143,7 @@ 
142 -> Beholder BeholdTV H6                     [5ace:6290]

143 -> Beholder BeholdTV M63                    [5ace:6191]

144 -> Beholder BeholdTV M6 Extra               [5ace:6193]

145 -> AVerMedia MiniPCI DVB-T Hybrid M103      [1461:f636]

145 -> AVerMedia MiniPCI DVB-T Hybrid M103      [1461:f636,1461:f736]

146 -> ASUSTeK P7131 Analog

147 -> Asus Tiger 3in1                          [1043:4878]

148 -> Encore ENLTV-FM v5.3                     [1a7f:2008]
@@ -154,4 +154,16 @@ 
153 -> Kworld Plus TV Analog Lite PCI           [17de:7128]

154 -> Avermedia AVerTV GO 007 FM Plus          [1461:f31d]

155 -> Hauppauge WinTV-HVR1120 ATSC/QAM-Hybrid  [0070:6706,0070:6708]

156 -> Hauppauge WinTV-HVR1110r3                [0070:6707,0070:6709,0070:670a]
 
156 -> Hauppauge WinTV-HVR1110r3 DVB-T/Hybrid   [0070:6707,0070:6709,0070:670a]

157 -> Avermedia AVerTV Studio 507UA            [1461:a11b]

158 -> AVerMedia Cardbus TV/Radio (E501R)       [1461:b7e9]

159 -> Beholder BeholdTV 505 RDS                [0000:505B]

160 -> Beholder BeholdTV 507 RDS                [0000:5071]

161 -> Beholder BeholdTV 507 RDS                [0000:507B]

162 -> Beholder BeholdTV 607 FM                 [5ace:6071]

163 -> Beholder BeholdTV 609 FM                 [5ace:6090]

164 -> Beholder BeholdTV 609 FM                 [5ace:6091]

165 -> Beholder BeholdTV 607 RDS                [5ace:6072]

166 -> Beholder BeholdTV 607 RDS                [5ace:6073]

167 -> Beholder BeholdTV 609 RDS                [5ace:6092]

168 -> Beholder BeholdTV 609 RDS                [5ace:6093]

CRA Git | Maintained and supported by SUSTech CRA and CCSE