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

Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb 

* 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (184 commits)
  V4L/DVB (5563): Radio-maestro.c Replace radio_ioctl to use video_ioctl2
  V4L/DVB (5562): Radio-gemtek-pci.c Replace gemtek_pci_ioctl to use video_ioctl2
  V4L/DVB (5560): Ivtv: fix incorrect bitwise-and for command flags.
  V4L/DVB (5558): Opera: use 7-bit i2c addresses
  V4L/DVB (5557): Cafe_ccic: check return value of pci_enable_device
  V4L/DVB (5556): Radio-gemtek.c Replace gemtek_ioctl to use video_ioctl2
  V4L/DVB (5555): Radio-aimslab.c Replace rt_ioctl to use video_ioctl2
  V4L/DVB (5554): Fix: vidioc_g_parm were not zeroing the memory
  V4L/DVB (5553): Replace typhoon_do_ioctl to use video_ioctl2
  V4L/DVB (5552): Plan-b: Switch to refcounting PCI API
  V4L/DVB (5551): Plan-b: header change
  V4L/DVB (5550): Radio-sf16fmi.c Replace fmi_do_ioctl to use video_ioctl2
  V4L/DVB (5549): Radio-sf16fmr2.c Replace fmr2_do_ioctl to use video_ioctl2
  V4L/DVB (5548): Fix v4l2 buffer to the length
  V4L/DVB (5547): Add ENUM_FRAMESIZES and ENUM_FRAMEINTERVALS ioctls
  V4L/DVB (5546): Radio-terratec.c Replace tt_do_ioctl to use video_ioctl2
  V4L/DVB (5545): Saa7146: Release capture buffers on device close
  V4L/DVB (5544): Budget-av: Make inversion setting configurable, add KNC ONE V1.0 card
  V4L/DVB (5543): Tda10023: Add support for frontend TDA10023
  V4L/DVB (5542): Budget-av: Remove polarity switching of the clock for DVB-C
  ...
parents d868772f d455cf5d

Documentation/feature-removal-schedule.txt

+12 −0
Original line number Diff line number Diff line
@@ -6,6 +6,18 @@ be removed from this file. 


---------------------------



What:	V4L2 VIDIOC_G_MPEGCOMP and VIDIOC_S_MPEGCOMP

When:	October 2007

Why:	Broken attempt to set MPEG compression parameters. These ioctls are

	not able to implement the wide variety of parameters that can be set

	by hardware MPEG encoders. A new MPEG control mechanism was created

	in kernel 2.6.18 that replaces these ioctls. See the V4L2 specification

	(section 1.9: Extended controls) for more information on this topic.

Who:	Hans Verkuil <hverkuil@xs4all.nl> and

	Mauro Carvalho Chehab <mchehab@infradead.org>



---------------------------



What:	/sys/devices/.../power/state

	dev->power.power_state

	dpm_runtime_{suspend,resume)()

Documentation/video4linux/CARDLIST.bttv

+2 −0
Original line number Diff line number Diff line
@@ -143,3 +143,5 @@ 
142 -> Sabrent TV-FM (bttv version)

143 -> Hauppauge ImpactVCB (bt878)                         [0070:13eb]

144 -> MagicTV

145 -> SSAI Security Video Interface                       [4149:5353]

146 -> SSAI Ultrasound Video Interface                     [414a:5353]

Documentation/video4linux/CARDLIST.cx88

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
 36 -> AVerTV 303 (M126)                                   [1461:000a]

 37 -> Hauppauge Nova-S-Plus DVB-S                         [0070:9201,0070:9202]

 38 -> Hauppauge Nova-SE2 DVB-S                            [0070:9200]

 39 -> KWorld DVB-S 100                                    [17de:08b2]

 39 -> KWorld DVB-S 100                                    [17de:08b2,1421:0341]

 40 -> Hauppauge WinTV-HVR1100 DVB-T/Hybrid                [0070:9400,0070:9402]

 41 -> Hauppauge WinTV-HVR1100 DVB-T/Hybrid (Low Profile)  [0070:9800,0070:9802]

 42 -> digitalnow DNTV Live! DVB-T Pro                     [1822:0025,1822:0019]

Documentation/video4linux/CARDLIST.ivtv

0 → 100644
+18 −0
Original line number Diff line number Diff line 
 1 -> Hauppauge WinTV PVR-250

 2 -> Hauppauge WinTV PVR-350

 3 -> Hauppauge WinTV PVR-150 or PVR-500

 4 -> AVerMedia M179 				[1461:a3ce,1461:a3cf]

 5 -> Yuan MPG600/Kuroutoshikou iTVC16-STVLP 	[12ab:fff3,12ab:ffff]

 6 -> Yuan MPG160/Kuroutoshikou iTVC15-STVLP 	[12ab:0000,10fc:40a0]

 7 -> Yuan PG600/DiamondMM PVR-550 		[ff92:0070,ffab:0600]

 8 -> Adaptec AVC-2410 				[9005:0093]

 9 -> Adaptec AVC-2010 				[9005:0092]

10 -> NAGASE TRANSGEAR 5000TV 			[1461:bfff]

11 -> AOpen VA2000MAX-STN6 			[0000:ff5f]

12 -> YUAN MPG600GR/Kuroutoshikou CX23416GYC-STVLP [12ab:0600,fbab:0600,1154:0523]

13 -> I/O Data GV-MVP/RX 			[10fc:d01e,10fc:d038,10fc:d039]

14 -> I/O Data GV-MVP/RX2E 			[10fc:d025]

15 -> GOTVIEW PCI DVD (partial support only) 	[12ab:0600]

16 -> GOTVIEW PCI DVD2 Deluxe 			[ffac:0600]

17 -> Yuan MPC622 				[ff01:d998]

18 -> Digital Cowboy DCT-MTVP1 			[1461:bfff]

Documentation/video4linux/CARDLIST.saa7134

+6 −2
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ 
 52 -> AverMedia AverTV/305                     [1461:2108]

 53 -> ASUS TV-FM 7135                          [1043:4845]

 54 -> LifeView FlyTV Platinum FM / Gold        [5168:0214,1489:0214,5168:0304]

 55 -> LifeView FlyDVB-T DUO                    [5168:0306]

 55 -> LifeView FlyDVB-T DUO / MSI TV@nywhere Duo [5168:0306,4E42:0306]

 56 -> Avermedia AVerTV 307                     [1461:a70a]

 57 -> Avermedia AVerTV GO 007 FM               [1461:f31f]

 58 -> ADS Tech Instant TV (saa7135)            [1421:0350,1421:0351,1421:0370,1421:1370]
@@ -76,7 +76,7 @@ 
 75 -> AVerMedia AVerTVHD MCE A180              [1461:1044]

 76 -> SKNet MonsterTV Mobile                   [1131:4ee9]

 77 -> Pinnacle PCTV 40i/50i/110i (saa7133)     [11bd:002e]

 78 -> ASUSTeK P7131 Dual                       [1043:4862,1043:4876]

 78 -> ASUSTeK P7131 Dual                       [1043:4862,1043:4857]

 79 -> Sedna/MuchTV PC TV Cardbus TV/Radio (ITO25 Rev:2B)

 80 -> ASUS Digimatrix TV                       [1043:0210]

 81 -> Philips Tiger reference design           [1131:2018]
@@ -107,3 +107,7 @@ 
106 -> Encore ENLTV                             [1131:2342,1131:2341,3016:2344]

107 -> Encore ENLTV-FM                          [1131:230f]

108 -> Terratec Cinergy HT PCI                  [153b:1175]

109 -> Philips Tiger - S Reference design

110 -> Avermedia M102                           [1461:f31e]

111 -> ASUS P7131 4871                          [1043:4871]

112 -> ASUSTeK P7131 Hybrid                     [1043:4876]

CRA Git | Maintained and supported by SUSTech CRA and CCSE