path: root/drivers/staging/media
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2015-01-24 22:34:54 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2015-01-24 22:34:54 (GMT)
commitaf469b374831f48744c14b60d3e6c928c5ce2ef0 (patch)
treed0c3cefb36fb6f92cf1cc59b58aec9ff729271c3 /drivers/staging/media
parentc4e00f1d31c4c83d15162782491689229bd92527 (diff)
parent2c0108e1c02f9fc95f465adc4d2ce1ad8688290a (diff)
Merge tag 'media/v3.19-4' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull media fixes from Mauro Carvalho Chehab: - fix some race conditions caused by a regression on videobuf2 - fix a interrupt release bug on cx23885 - fix support for Mygica T230 and HVR4400 - fix compilation breakage when USB is not selected on tlg2300 - fix capabilities report on ompa3isp, soc-camera, rcar_vin and pvrusb2 * tag 'media/v3.19-4' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: [media] omap3isp: Correctly set QUERYCAP capabilities [media] cx23885: fix free interrupt bug [media] pvrusb2: fix missing device_caps in querycap [media] vb2: fix vb2_thread_stop race conditions [media] rcar_vin: Update device_caps and capabilities in querycap [media] soc-camera: fix device capabilities in multiple camera host drivers [media] Fix Mygica T230 support [media] cx23885: Split Hauppauge WinTV Starburst from HVR4400 card entry [media] tlg2300: Fix media dependencies
Diffstat (limited to 'drivers/staging/media')
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/staging/media/tlg2300/Kconfig b/drivers/staging/media/tlg2300/Kconfig
index 81784c6..77d8753 100644
--- a/drivers/staging/media/tlg2300/Kconfig
+++ b/drivers/staging/media/tlg2300/Kconfig
@@ -1,6 +1,7 @@
config VIDEO_TLG2300
tristate "Telegent TLG2300 USB video capture support (Deprecated)"
depends on VIDEO_DEV && I2C && SND && DVB_CORE
+ depends on MEDIA_USB_SUPPORT
depends on RC_CORE

Privacy Policy