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

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

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (310 commits)
  V4L/DVB (6316): Change list_for_each+list_entry to list_for_each_entry
  V4L/DVB (6315): pvrusb2: Change list_for_each+list_entry to list_for_each_entry
  V4L/DVB (6314): saa7134: Replace list_for_each+list_entry with list_for_each_entry
  V4L/DVB (6313): ivtv: Replace list_for_each+list_entry with list_for_each_entry
  V4L/DVB (6312): cx88: Replace list_for_each+list_entry with list_for_each_entry
  V4L/DVB (6311): dvb: Replace list_for_each+list_entry with list_for_each_entry
  V4L/DVB (6308): V4L: zc0301, remove bad usage of ERESTARTSYS
  V4L/DVB (6307): V4L: w9968cf, remove bad usage of ERESTARTSYS
  V4L/DVB (6306): Few clenups for saa7134 resume code
  V4L/DVB (6305): V4L: videobuf-core.c avoid NULL dereferences in videobuf-core
  V4L/DVB (6301): pvrusb: Update DEBUGIFC sysfs to kernel 2.6.13+
  V4L/DVB (6300): CodingStyle cleanup
  V4L/DVB (6299): dvb: Add dependencies for VIDEOBUF_DVB
  V4L/DVB (6297): cx23885: remove wrong Kconfig selection of VIDEOBUF
  V4L/DVB (6296): dib0700: add support for AverMedia DVB-T Express card
  V4L/DVB (6295): saa7134: add autodetection for KWorld ATSC-115
  V4L/DVB (6293): V4L: convert struct class_device to struct device
  V4L/DVB (6292): videobuf_core init always require callback implementation
  V4L/DVB (6291): Fix: avoid oops on some SMP machines
  V4L/DVB (6290): remove videobuf_set_pci_ops
  ...
parents 6abd2c86 a991f44b

Documentation/dvb/faq.txt

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ Some very frequently asked questions about linuxtv-dvb 
	- saa7146_vv: SAA7146 video and vbi functions. These are only needed

	  for full-featured cards.



	- video-buf: capture helper module for the saa7146_vv driver. This

	- videobuf-dma-sg: capture helper module for the saa7146_vv driver. This

	  one is responsible to handle capture buffers.



	- dvb-ttpci: The main driver for AV7110 based, full-featured

Documentation/video4linux/CARDLIST.bttv

+1 −0
Original line number Diff line number Diff line
@@ -147,3 +147,4 @@ 
146 -> SSAI Ultrasound Video Interface                     [414a:5353]

147 -> VoodooTV 200 (USA)                                  [121a:3000]

148 -> DViCO FusionHDTV 2                                  [dbc0:d200]

149 -> Typhoon TV-Tuner PCI (50684)

Documentation/video4linux/CARDLIST.cx23885

0 → 100644
+5 −0
Original line number Diff line number Diff line 
  0 -> UNKNOWN/GENERIC                                     [0070:3400]

  1 -> Hauppauge WinTV-HVR1800lp                           [0070:7600]

  2 -> Hauppauge WinTV-HVR1800                             [0070:7800,0070:7801]

  3 -> Hauppauge WinTV-HVR1250                             [0070:7911]

  4 -> DViCO FusionHDTV5 Express                           [18ac:d500]

Documentation/video4linux/CARDLIST.saa7134

+3 −2
Original line number Diff line number Diff line
@@ -88,11 +88,11 @@ 
 87 -> ADS Instant TV Duo Cardbus PTV331        [0331:1421]

 88 -> Tevion/KWorld DVB-T 220RF                [17de:7201]

 89 -> ELSA EX-VISION 700TV                     [1048:226c]

 90 -> Kworld ATSC110                           [17de:7350]

 90 -> Kworld ATSC110/115                       [17de:7350,17de:7352]

 91 -> AVerMedia A169 B                         [1461:7360]

 92 -> AVerMedia A169 B1                        [1461:6360]

 93 -> Medion 7134 Bridge #2                    [16be:0005]

 94 -> LifeView FlyDVB-T Hybrid Cardbus         [5168:3306,5168:3502]

 94 -> LifeView FlyDVB-T Hybrid Cardbus/MSI TV @nywhere A/D NB [5168:3306,5168:3502,4e42:3502]

 95 -> LifeView FlyVIDEO3000 (NTSC)             [5169:0138]

 96 -> Medion Md8800 Quadro                     [16be:0007,16be:0008]

 97 -> LifeView FlyDVB-S /Acorp TV134DS         [5168:0300,4e42:0300]
@@ -115,3 +115,4 @@ 
114 -> KWorld DVB-T 210                         [17de:7250]

115 -> Sabrent PCMCIA TV-PCB05                  [0919:2003]

116 -> 10MOONS TM300 TV Card                    [1131:2304]

117 -> Avermedia Super 007                      [1461:f01d]

drivers/media/Kconfig

+68 −2
Original line number Diff line number Diff line
@@ -69,13 +69,79 @@ source "drivers/media/common/Kconfig" 
config VIDEO_TUNER

	tristate

	depends on I2C

	select TUNER_MT20XX if !VIDEO_TUNER_CUSTOMIZE

	select TUNER_TDA8290 if !VIDEO_TUNER_CUSTOMIZE

	select TUNER_TEA5761 if !VIDEO_TUNER_CUSTOMIZE

	select TUNER_TEA5767 if !VIDEO_TUNER_CUSTOMIZE

	select TUNER_SIMPLE if !VIDEO_TUNER_CUSTOMIZE



menuconfig VIDEO_TUNER_CUSTOMIZE

	bool "Customize analog tuner modules to build"

	depends on VIDEO_TUNER

	help

	  This allows the user to deselect tuner drivers unnecessary

	  for their hardware from the build. Use this option with care

	  as deselecting tuner drivers which are in fact necessary will

	  result in V4L devices which cannot be tuned due to lack of

	  driver support



	  If unsure say N.



if VIDEO_TUNER_CUSTOMIZE



config TUNER_MT20XX

	tristate "Microtune 2032 / 2050 tuners"

	depends on I2C

	default m if VIDEO_TUNER_CUSTOMIZE

	help

	  Say Y here to include support for the MT2032 / MT2050 tuner.



config TUNER_TDA8290

	tristate "TDA 8290+8275(a) tuner combo"

	depends on I2C

	default m if VIDEO_TUNER_CUSTOMIZE

	help

	  Say Y here to include support for Philips TDA8290+8275(a) tuner.



config TUNER_TEA5761

	tristate "TEA 5761 radio tuner (EXPERIMENTAL)"

	depends on I2C && EXPERIMENTAL

	default m if VIDEO_TUNER_CUSTOMIZE

	help

	  Say Y here to include support for the Philips TEA5761 radio tuner.



config TUNER_TEA5767

	tristate "TEA 5767 radio tuner"

	depends on I2C

	default m if VIDEO_TUNER_CUSTOMIZE

	help

	  Say Y here to include support for the Philips TEA5767 radio tuner.



config TUNER_SIMPLE

	tristate "Simple tuner support"

	depends on I2C

	default m if VIDEO_TUNER_CUSTOMIZE

	help

	  Say Y here to include support for various simple tuners.



config VIDEO_BUF

endif # VIDEO_TUNER_CUSTOMIZE



config VIDEOBUF_GEN

	tristate



config VIDEOBUF_DMA_SG

	depends on PCI

	select VIDEOBUF_GEN

	tristate



config VIDEOBUF_VMALLOC

	select VIDEOBUF_GEN

	tristate



config VIDEO_BUF_DVB

config VIDEOBUF_DVB

	tristate

	select VIDEOBUF_GEN

	select VIDEOBUF_DMA_SG



config VIDEO_BTCX

	tristate

CRA Git | Maintained and supported by SUSTech CRA and CCSE